Updated xen patches taken from suse.

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.25 / patches.xen / xen-x86-consistent-nmi

diff --git a/src/patches/60060_xen-x86-consistent-nmi.patch1 b/src/patches/suse-2.6.27.25/patches.xen/xen-x86-consistent-nmi
similarity index 76%
rename from src/patches/60060_xen-x86-consistent-nmi.patch1
rename to src/patches/suse-2.6.27.25/patches.xen/xen-x86-consistent-nmi
index b398997f1c04f1faa3da11f0f736ae5aa3144a43..16ae28b6f0e381a9e4b438f36e082758f842ba00 100644 (file)
--- a/src/patches/60060_xen-x86-consistent-nmi.patch1
+++ b/src/patches/suse-2.6.27.25/patches.xen/xen-x86-consistent-nmi
@@ -3,27 +3,8 @@ Subject: make i386 and x86 NMI code consistent, disable all APIC-related stuff
 Patch-mainline: obsolete
 References: 191115
 
----
- 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
 @@ -120,7 +120,6 @@ ifeq ($(CONFIG_X86_64),y)
  
          obj-$(CONFIG_PCI_MMCONFIG)    += mmconf-fam10h_64.o
@@ -32,8 +13,16 @@ References: 191115
        time_64-$(CONFIG_XEN)           += time_32.o
  endif
  
---- a/arch/x86/kernel/nmi.c
-+++ b/arch/x86/kernel/nmi.c
+--- head-2008-12-08.orig/arch/x86/kernel/cpu/Makefile  2008-12-08 13:37:45.000000000 +0100
++++ head-2008-12-08/arch/x86/kernel/cpu/Makefile       2008-12-08 13:39:19.000000000 +0100
+@@ -24,4 +24,4 @@ obj-$(CONFIG_CPU_FREQ)       += cpufreq/
+ 
+ obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
+ 
+-disabled-obj-$(CONFIG_XEN) := hypervisor.o vmware.o
++disabled-obj-$(CONFIG_XEN) := hypervisor.o perfctr-watchdog.o vmware.o
+--- head-2008-12-08.orig/arch/x86/kernel/nmi.c 2008-12-08 13:25:43.000000000 +0100
++++ head-2008-12-08/arch/x86/kernel/nmi.c      2008-12-08 13:39:19.000000000 +0100
 @@ -27,7 +27,7 @@
  #include <linux/kdebug.h>
  #include <linux/smp.h>
@@ -102,8 +91,8 @@ References: 191115
        }
  }
 +#endif
---- a/arch/x86/kernel/traps_32-xen.c
-+++ b/arch/x86/kernel/traps_32-xen.c
+--- head-2008-12-08.orig/arch/x86/kernel/traps_32-xen.c        2008-12-08 13:37:51.000000000 +0100
++++ head-2008-12-08/arch/x86/kernel/traps_32-xen.c     2008-12-08 13:39:19.000000000 +0100
 @@ -823,12 +823,14 @@ static notrace __kprobes void default_do
                                                                == NOTIFY_STOP)
                        return;
@@ -119,8 +108,8 @@ References: 191115
                if (!do_nmi_callback(regs, cpu))
                        unknown_nmi_error(reason, regs);
  #else
---- a/arch/x86/kernel/traps_64-xen.c
-+++ b/arch/x86/kernel/traps_64-xen.c
+--- head-2008-12-08.orig/arch/x86/kernel/traps_64-xen.c        2008-12-08 13:37:51.000000000 +0100
++++ head-2008-12-08/arch/x86/kernel/traps_64-xen.c     2008-12-08 13:39:19.000000000 +0100
 @@ -636,7 +636,7 @@ void die(const char *str, struct pt_regs
        oops_end(flags, regs, SIGSEGV);
  }
@@ -148,8 +137,8 @@ References: 191115
  
                return;
        }
---- a/arch/x86/mach-xen/setup.c
-+++ b/arch/x86/mach-xen/setup.c
+--- head-2008-12-08.orig/arch/x86/mach-xen/setup.c     2008-12-08 13:25:43.000000000 +0100
++++ head-2008-12-08/arch/x86/mach-xen/setup.c  2008-12-08 13:39:19.000000000 +0100
 @@ -108,12 +108,10 @@ void __init machine_specific_arch_setup(
                .address = CALLBACK_ADDR(system_call)
        };
@@ -179,8 +168,8 @@ References: 191115
  
  #ifdef CONFIG_X86_32
        /* Do an early initialization of the fixmap area */
---- a/include/asm-x86/irq.h
-+++ b/include/asm-x86/irq.h
+--- head-2008-12-08.orig/include/asm-x86/irq.h 2008-12-08 13:15:52.000000000 +0100
++++ head-2008-12-08/include/asm-x86/irq.h      2008-12-08 13:39:19.000000000 +0100
 @@ -15,7 +15,7 @@ static inline int irq_canonicalize(int i
        return ((irq == 2) ? 9 : irq);
  }
@@ -190,8 +179,8 @@ References: 191115
  # define ARCH_HAS_NMI_WATCHDOG
  #endif
  
---- a/include/asm-x86/nmi.h
-+++ b/include/asm-x86/nmi.h
+--- head-2008-12-08.orig/include/asm-x86/nmi.h 2008-12-08 13:15:52.000000000 +0100
++++ head-2008-12-08/include/asm-x86/nmi.h      2008-12-08 13:39:19.000000000 +0100
 @@ -5,8 +5,6 @@
  #include <asm/irq.h>
  #include <asm/io.h>
@@ -239,8 +228,8 @@ References: 191115
  void stop_nmi(void);
  void restart_nmi(void);
  
---- a/kernel/sysctl.c
-+++ b/kernel/sysctl.c
+--- head-2008-12-08.orig/kernel/sysctl.c       2008-12-08 13:17:58.000000000 +0100
++++ head-2008-12-08/kernel/sysctl.c    2008-12-08 13:39:19.000000000 +0100
 @@ -673,6 +673,7 @@ static struct ctl_table kern_table[] = {
                .mode           = 0644,
                .proc_handler   = &proc_dointvec,