Merge branch 'linux-2.6'

1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/timer.c b/kernel/timer.c
index d4527dcef1af..2a00c22203f3 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;