----
- arch/x86/kernel/Makefile | 1 -
- arch/x86/kernel/cpu/Makefile | 2 +-
- arch/x86/kernel/nmi.c | 13 ++++++++++---
- arch/x86/kernel/traps_32-xen.c | 2 ++
- arch/x86/kernel/traps_64-xen.c | 6 +++++-
- arch/x86/mach-xen/setup.c | 4 ----
- include/asm-x86/irq.h | 2 +-
- include/asm-x86/nmi.h | 12 ++++++++----
- kernel/sysctl.c | 2 ++
- 9 files changed, 29 insertions(+), 15 deletions(-)
-
---- a/arch/x86/kernel/cpu/Makefile
-+++ b/arch/x86/kernel/cpu/Makefile
-@@ -24,3 +24,4 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq/
-
- obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
-+disabled-obj-$(CONFIG_XEN) := perfctr-watchdog.o
-
---- a/arch/x86/kernel/Makefile
-+++ b/arch/x86/kernel/Makefile
+--- head-2008-12-08.orig/arch/x86/kernel/Makefile 2008-12-08 13:37:43.000000000 +0100
++++ head-2008-12-08/arch/x86/kernel/Makefile 2008-12-08 13:39:19.000000000 +0100