Merge branch 'omap/soc' into next/soc

[firefly-linux-kernel-4.4.55.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index 8cff36119e4d50f7336a06e8d01e59e8b162e694..9c3c62b0c4bc89ebd307ff79950039021d157861 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -20,7 +20,7 @@
  */
 
 #include <linux/kernel_stat.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/interrupt.h>
 #include <linux/percpu.h>
 #include <linux/init.h>
@@ -1368,7 +1368,7 @@ SYSCALL_DEFINE0(getppid)
        int pid;
 
        rcu_read_lock();
-       pid = task_tgid_vnr(current->real_parent);
+       pid = task_tgid_vnr(rcu_dereference(current->real_parent));
        rcu_read_unlock();
 
        return pid;