diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /kernel/timer.c | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index f087d239f..b28c69123 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -15,6 +15,7 @@ * 1999-03-10 Improved NTP compatibility by Ulrich Windl */ +#include <linux/config.h> #include <linux/mm.h> #include <linux/timex.h> #include <linux/delay.h> @@ -211,7 +212,7 @@ int del_timer(struct timer_list * timer) return ret; } -#ifdef __SMP__ +#ifdef CONFIG_SMP /* * SMP specific function to delete periodic timer. * Caller must disable by some means restarting the timer @@ -564,7 +565,7 @@ static void update_process_times(unsigned long ticks, unsigned long system) /* * SMP does this on a per-CPU basis elsewhere */ -#ifndef __SMP__ +#ifndef CONFIG_SMP struct task_struct * p = current; unsigned long user = ticks - system; if (p->pid) { @@ -748,7 +749,7 @@ asmlinkage long sys_getppid(void) parent = me->p_opptr; for (;;) { pid = parent->pid; -#if __SMP__ +#if CONFIG_SMP { struct task_struct *old = parent; mb(); |