diff --git a/fs/proc/array.c b/fs/proc/array.c

index 39684c79e8e2..138b60d1314d 100644

--- a/fs/proc/array.c

+++ b/fs/proc/array.c

@@ -394,13 +394,20 @@ static inline void task_seccomp(struct seq_file *m, struct task_struct *p)

 	seq_putc(m, '\n');

 }

+#include <linux/livepatch.h>

 static inline void task_context_switch_counts(struct seq_file *m,

 						struct task_struct *p)

 {

+	int *newpid;

+

 	seq_printf(m,	"voluntary_ctxt_switches:\t%lu\n"

 			"nonvoluntary_ctxt_switches:\t%lu\n",

 			p->nvcsw,

 			p->nivcsw);

+

+	newpid = klp_shadow_get(p, 0);

+	if (newpid)

+		seq_printf(m, "newpid:\t%d\n", *newpid);

 }

 static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)

diff --git a/kernel/exit.c b/kernel/exit.c

index 148a7842928d..e1dbab71b37d 100644

--- a/kernel/exit.c

+++ b/kernel/exit.c

@@ -791,6 +791,7 @@ static void check_stack_usage(void)

 static inline void check_stack_usage(void) {}

 #endif

+#include <linux/livepatch.h>

 void do_exit(long code)

 {

 	struct task_struct *tsk = current;

@@ -888,6 +889,8 @@ void do_exit(long code)

 	check_stack_usage();

 	exit_thread();

+	klp_shadow_free(tsk, 0, NULL);

+

 	/*

 	 * Flush inherited counters to the parent - before the parent

 	 * gets woken up by child-exit notifications.

diff --git a/kernel/fork.c b/kernel/fork.c

index 9bff3b28c357..529a2c943d7c 100644

--- a/kernel/fork.c

+++ b/kernel/fork.c

@@ -1757,6 +1757,7 @@ struct task_struct *fork_idle(int cpu)

  * It copies the process, and if successful kick-starts

  * it and waits for it to finish using the VM if required.

  */

+#include <linux/livepatch.h>

 long do_fork(unsigned long clone_flags,

 	      unsigned long stack_start,

 	      unsigned long stack_size,

@@ -1794,6 +1795,13 @@ long do_fork(unsigned long clone_flags,

 	if (!IS_ERR(p)) {

 		struct completion vfork;

 		struct pid *pid;

+		int *newpid;

+		static int ctr = 0;

+

+		newpid = klp_shadow_get_or_alloc(p, 0, sizeof(*newpid), GFP_KERNEL,

+						NULL, NULL);

+		if (newpid)

+			*newpid = ctr++;

 		trace_sched_process_fork(current, p);