X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Ftimer.c;h=5377f40723ff0dc37f13897847ea040f8c317292;hb=ef88b7dba2b47c70037a34a599d383462bb74bd3;hp=51ff917c959029d8b51e13696c34df5a62ee1def;hpb=f46f6b20cb01508f5020142ff91021f8fb39550b;p=linux-2.6 diff --git a/kernel/timer.c b/kernel/timer.c index 51ff917c95..5377f40723 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1023,7 +1023,7 @@ asmlinkage long sys_getppid(void) parent = me->group_leader->real_parent; for (;;) { pid = parent->tgid; -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT) { struct task_struct *old = parent; @@ -1597,7 +1597,7 @@ void msleep(unsigned int msecs) EXPORT_SYMBOL(msleep); /** - * msleep_interruptible - sleep waiting for waitqueue interruptions + * msleep_interruptible - sleep waiting for signals * @msecs: Time in milliseconds to sleep for */ unsigned long msleep_interruptible(unsigned int msecs)