X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Ftimer.c;h=2a00c22203f30179296211bcacb7697f27c5e18c;hb=78f2c7db6068fd6ef75b8c120f04a388848eacb5;hp=d4527dcef1af8b325115ad37adb1b034a199d7b3;hpb=02d5bccf8ea3f9b8de21bfe19db77fbc50d92e04;p=linux-2.6

diff --git a/kernel/timer.c b/kernel/timer.c
index d4527dcef1..2a00c22203 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -978,7 +978,7 @@ asmlinkage long sys_getppid(void)
 	int pid;
 
 	rcu_read_lock();
-	pid = task_ppid_nr_ns(current, current->nsproxy->pid_ns);
+	pid = task_tgid_nr_ns(current->real_parent, current->nsproxy->pid_ns);
 	rcu_read_unlock();
 
 	return pid;
@@ -1289,7 +1289,7 @@ static void migrate_timer_list(tvec_base_t *new_base, struct list_head *head)
 	}
 }
 
-static void __devinit migrate_timers(int cpu)
+static void __cpuinit migrate_timers(int cpu)
 {
 	tvec_base_t *old_base;
 	tvec_base_t *new_base;