patch-2.3.40 linux/arch/i386/kernel/time.c
Next file: linux/arch/i386/kernel/traps.c
Previous file: linux/arch/i386/kernel/smpboot.c
Back to the patch index
Back to the overall index
- Lines: 27
- Date:
Thu Jan 20 09:51:42 2000
- Orig file:
v2.3.39/linux/arch/i386/kernel/time.c
- Orig date:
Wed Dec 8 14:11:25 1999
diff -u --recursive --new-file v2.3.39/linux/arch/i386/kernel/time.c linux/arch/i386/kernel/time.c
@@ -42,12 +42,14 @@
#include <linux/init.h>
#include <linux/smp.h>
-#include <asm/processor.h>
-#include <asm/uaccess.h>
#include <asm/io.h>
+#include <asm/smp.h>
#include <asm/irq.h>
-#include <asm/delay.h>
#include <asm/msr.h>
+#include <asm/delay.h>
+#include <asm/mpspec.h>
+#include <asm/uaccess.h>
+#include <asm/processor.h>
#include <linux/mc146818rtc.h>
#include <linux/timex.h>
@@ -368,7 +370,7 @@
* profiling, except when we simulate SMP mode on a uniprocessor
* system, in that case we have to call the local interrupt handler.
*/
-#ifndef __SMP__
+#ifndef CONFIG_X86_LOCAL_APIC
if (!user_mode(regs))
x86_do_profile(regs->eip);
#else
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)