patch-2.3.99-pre6 linux/kernel/timer.c

• Lines: 35
• Date: Fri Apr 21 16:08:45 2000
• Orig file: v2.3.99-pre5/linux/kernel/timer.c
• Orig date: Thu Feb 10 17:11:23 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/kernel/timer.c linux/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 @@
 	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 @@
 /*
  * 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 @@
 	parent = me->p_opptr;
 	for (;;) {
 		pid = parent->pid;
-#if __SMP__
+#if CONFIG_SMP
 {
 		struct task_struct *old = parent;
 		mb();