]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blobdiff - src/patches/suse-2.6.27.39/patches.xen/xen-x86-no-lapic
projects / people / teissler / ipfire-2.x.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Imported linux-2.6.27.39 suse/xen patches.
[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.39 / patches.xen / xen-x86-no-lapic
diff --git a/src/patches/suse-2.6.27.31/patches.xen/xen-x86-no-lapic b/src/patches/suse-2.6.27.39/patches.xen/xen-x86-no-lapic
similarity index 86%
rename from src/patches/suse-2.6.27.31/patches.xen/xen-x86-no-lapic
rename to src/patches/suse-2.6.27.39/patches.xen/xen-x86-no-lapic
index cdf9226362d6bfc4f91f4c7da1592b2592c27803..8ce67202cc5b977325ef55a09303bd2d1f8c2779 100644 (file)
--- a/src/patches/suse-2.6.27.31/patches.xen/xen-x86-no-lapic
+++ b/src/patches/suse-2.6.27.39/patches.xen/xen-x86-no-lapic
@@ -3,8 +3,8 @@ Subject: Disallow all accesses to the local APIC page
 Patch-mainline: obsolete
 References: 191115
 
---- sle11-2009-06-04.orig/arch/x86/kernel/Makefile     2009-06-04 10:47:37.000000000 +0200
-+++ sle11-2009-06-04/arch/x86/kernel/Makefile  2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/arch/x86/kernel/Makefile     2008-12-08 13:39:19.000000000 +0100
++++ sle11-2009-08-26/arch/x86/kernel/Makefile  2009-06-04 10:47:37.000000000 +0200
 @@ -120,9 +120,11 @@ ifeq ($(CONFIG_X86_64),y)
  
          obj-$(CONFIG_PCI_MMCONFIG)    += mmconf-fam10h_64.o
@@ -20,8 +20,8 @@ References: 191115
 +      genx2apic_%.o hpet.o i8253.o i8259.o irqinit_$(BITS).o \
 +      pci-swiotlb_64.o reboot.o smpboot.o tlb_$(BITS).o tsc.o tsc_sync.o \
 +      uv_%.o vsmp_64.o
---- sle11-2009-06-04.orig/arch/x86/kernel/acpi/boot.c  2009-06-04 10:21:39.000000000 +0200
-+++ sle11-2009-06-04/arch/x86/kernel/acpi/boot.c       2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/arch/x86/kernel/acpi/boot.c  2009-08-26 12:03:49.000000000 +0200
++++ sle11-2009-08-26/arch/x86/kernel/acpi/boot.c       2009-08-26 12:15:28.000000000 +0200
 @@ -89,7 +89,7 @@ int acpi_sci_override_gsi __initdata;
  int acpi_skip_timer_override __initdata;
  int acpi_use_timer_override __initdata;
@@ -46,7 +46,7 @@ References: 191115
  
        acpi_madt_oem_check(madt->header.oem_id, madt->header.oem_table_id);
  
-@@ -317,6 +319,7 @@ static int __init
+@@ -315,6 +317,7 @@ static int __init
  acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header,
                          const unsigned long end)
  {
@@ -54,7 +54,7 @@ References: 191115
        struct acpi_madt_local_apic_override *lapic_addr_ovr = NULL;
  
        lapic_addr_ovr = (struct acpi_madt_local_apic_override *)header;
-@@ -325,6 +328,7 @@ acpi_parse_lapic_addr_ovr(struct acpi_su
+@@ -323,6 +326,7 @@ acpi_parse_lapic_addr_ovr(struct acpi_su
                return -EINVAL;
  
        acpi_lapic_addr = lapic_addr_ovr->address;
@@ -62,7 +62,7 @@ References: 191115
  
        return 0;
  }
-@@ -904,10 +908,12 @@ static int mp_find_ioapic(int gsi)
+@@ -902,10 +906,12 @@ static int mp_find_ioapic(int gsi)
  static u8 __init uniq_ioapic_id(u8 id)
  {
  #ifdef CONFIG_X86_32
@@ -75,7 +75,7 @@ References: 191115
                return id;
  #else
        int i;
-@@ -1139,7 +1145,7 @@ int mp_register_gsi(u32 gsi, int trigger
+@@ -1137,7 +1143,7 @@ int mp_register_gsi(u32 gsi, int trigger
  
        ioapic_pin = gsi - mp_ioapic_routing[ioapic].gsi_base;
  
@@ -84,8 +84,8 @@ References: 191115
        if (ioapic_renumber_irq)
                gsi = ioapic_renumber_irq(ioapic, gsi);
  #endif
---- sle11-2009-06-04.orig/arch/x86/kernel/apic_32-xen.c        2009-06-04 10:21:39.000000000 +0200
-+++ sle11-2009-06-04/arch/x86/kernel/apic_32-xen.c     2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/arch/x86/kernel/apic_32-xen.c        2009-06-04 10:21:39.000000000 +0200
++++ sle11-2009-08-26/arch/x86/kernel/apic_32-xen.c     2009-06-04 10:47:37.000000000 +0200
 @@ -1,60 +1,11 @@
  /*
 - *    Local APIC handling, local APIC timers
@@ -198,7 +198,7 @@ References: 191115
        return 0;
  }
 +#endif
---- sle11-2009-06-04.orig/arch/x86/kernel/apic_64-xen.c        2009-06-04 10:21:39.000000000 +0200
+--- sle11-2009-08-26.orig/arch/x86/kernel/apic_64-xen.c        2009-06-04 10:21:39.000000000 +0200
 +++ /dev/null  1970-01-01 00:00:00.000000000 +0000
 @@ -1,188 +0,0 @@
 -/*
@@ -389,8 +389,8 @@ References: 191115
 -              smp_processor_id(), v , v1);
 -      irq_exit();
 -}
---- sle11-2009-06-04.orig/arch/x86/kernel/cpu/common-xen.c     2009-06-04 10:46:36.000000000 +0200
-+++ sle11-2009-06-04/arch/x86/kernel/cpu/common-xen.c  2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/arch/x86/kernel/cpu/common-xen.c     2009-02-16 17:03:24.000000000 +0100
++++ sle11-2009-08-26/arch/x86/kernel/cpu/common-xen.c  2009-06-04 10:47:37.000000000 +0200
 @@ -19,10 +19,6 @@
  #include <asm/mpspec.h>
  #include <asm/apic.h>
@@ -402,8 +402,8 @@ References: 191115
  #endif
  #include <asm/hypervisor.h>
  
---- sle11-2009-06-04.orig/arch/x86/kernel/genapic_64-xen.c     2009-06-04 10:46:28.000000000 +0200
-+++ sle11-2009-06-04/arch/x86/kernel/genapic_64-xen.c  2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/arch/x86/kernel/genapic_64-xen.c     2008-11-04 14:40:00.000000000 +0100
++++ sle11-2009-08-26/arch/x86/kernel/genapic_64-xen.c  2009-06-04 10:47:37.000000000 +0200
 @@ -18,7 +18,6 @@
  #include <linux/hardirq.h>
  
@@ -412,8 +412,8 @@ References: 191115
  #include <asm/genapic.h>
  
  #ifdef CONFIG_ACPI
---- sle11-2009-06-04.orig/arch/x86/kernel/genapic_xen_64.c     2009-06-04 10:47:21.000000000 +0200
-+++ sle11-2009-06-04/arch/x86/kernel/genapic_xen_64.c  2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/arch/x86/kernel/genapic_xen_64.c     2009-06-04 10:47:21.000000000 +0200
++++ sle11-2009-08-26/arch/x86/kernel/genapic_xen_64.c  2009-06-04 10:47:37.000000000 +0200
 @@ -18,7 +18,6 @@
  #include <linux/init.h>
  #ifdef CONFIG_XEN_PRIVILEGED_GUEST
@@ -477,8 +477,8 @@ References: 191115
        .send_IPI_all = xen_send_IPI_all,
        .send_IPI_allbutself = xen_send_IPI_allbutself,
        .send_IPI_mask = xen_send_IPI_mask,
---- sle11-2009-06-04.orig/arch/x86/kernel/io_apic_32-xen.c     2009-06-04 10:46:34.000000000 +0200
-+++ sle11-2009-06-04/arch/x86/kernel/io_apic_32-xen.c  2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/arch/x86/kernel/io_apic_32-xen.c     2008-11-25 14:37:47.000000000 +0100
++++ sle11-2009-08-26/arch/x86/kernel/io_apic_32-xen.c  2009-06-04 10:47:37.000000000 +0200
 @@ -48,7 +48,6 @@
  #include <asm/hypertransport.h>
  
@@ -552,8 +552,8 @@ References: 191115
  
  static int __init parse_noapic(char *arg)
  {
---- sle11-2009-06-04.orig/arch/x86/kernel/io_apic_64-xen.c     2009-06-04 10:46:34.000000000 +0200
-+++ sle11-2009-06-04/arch/x86/kernel/io_apic_64-xen.c  2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/arch/x86/kernel/io_apic_64-xen.c     2008-11-25 14:29:21.000000000 +0100
++++ sle11-2009-08-26/arch/x86/kernel/io_apic_64-xen.c  2009-06-04 10:47:37.000000000 +0200
 @@ -78,10 +78,6 @@ char system_vectors[NR_VECTORS] = { [0 .
  
  int sis_apic_bug; /* not actually supported, dummy for compile */
@@ -614,8 +614,8 @@ References: 191115
  
  /*
   *
---- sle11-2009-06-04.orig/arch/x86/kernel/irq_32-xen.c 2009-06-04 10:47:21.000000000 +0200
-+++ sle11-2009-06-04/arch/x86/kernel/irq_32-xen.c      2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/arch/x86/kernel/irq_32-xen.c 2009-06-04 10:47:21.000000000 +0200
++++ sle11-2009-08-26/arch/x86/kernel/irq_32-xen.c      2009-06-04 10:47:37.000000000 +0200
 @@ -252,7 +252,9 @@ unsigned int do_IRQ(struct pt_regs *regs
   * Interrupt statistics:
   */
@@ -668,8 +668,8 @@ References: 191115
  }
  
  #ifdef CONFIG_HOTPLUG_CPU
---- sle11-2009-06-04.orig/arch/x86/kernel/irq_64-xen.c 2009-06-04 10:47:21.000000000 +0200
-+++ sle11-2009-06-04/arch/x86/kernel/irq_64-xen.c      2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/arch/x86/kernel/irq_64-xen.c 2009-06-04 10:47:21.000000000 +0200
++++ sle11-2009-08-26/arch/x86/kernel/irq_64-xen.c      2009-06-04 10:47:37.000000000 +0200
 @@ -18,7 +18,9 @@
  #include <asm/idle.h>
  #include <asm/smp.h>
@@ -737,8 +737,8 @@ References: 191115
  }
  
  /*
---- sle11-2009-06-04.orig/arch/x86/kernel/mpparse-xen.c        2009-06-04 10:21:39.000000000 +0200
-+++ sle11-2009-06-04/arch/x86/kernel/mpparse-xen.c     2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/arch/x86/kernel/mpparse-xen.c        2009-06-04 10:21:39.000000000 +0200
++++ sle11-2009-08-26/arch/x86/kernel/mpparse-xen.c     2009-06-04 10:47:37.000000000 +0200
 @@ -31,7 +31,6 @@
  
  #include <mach_apic.h>
@@ -795,8 +795,25 @@ References: 191115
                        return;
                }
  
---- sle11-2009-06-04.orig/arch/x86/kernel/traps_64-xen.c       2009-06-04 10:47:37.000000000 +0200
-+++ sle11-2009-06-04/arch/x86/kernel/traps_64-xen.c    2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/arch/x86/kernel/setup_percpu-xen.c   2009-06-04 10:21:39.000000000 +0200
++++ sle11-2009-08-26/arch/x86/kernel/setup_percpu-xen.c        2009-08-26 12:17:43.000000000 +0200
+@@ -17,14 +17,9 @@
+ 
+ #ifdef CONFIG_X86_LOCAL_APIC
+ unsigned int num_processors;
+-unsigned disabled_cpus __cpuinitdata;
+ /* Processor that is doing the boot up */
+ unsigned int boot_cpu_physical_apicid = -1U;
+-unsigned int max_physical_apicid;
+ EXPORT_SYMBOL(boot_cpu_physical_apicid);
+-
+-/* Bitmask of physically existing CPUs */
+-physid_mask_t phys_cpu_present_map;
+ #endif
+ 
+ /* map cpu index to physical APIC ID */
+--- sle11-2009-08-26.orig/arch/x86/kernel/traps_64-xen.c       2008-12-08 13:39:19.000000000 +0100
++++ sle11-2009-08-26/arch/x86/kernel/traps_64-xen.c    2009-06-04 10:47:37.000000000 +0200
 @@ -1174,15 +1174,15 @@ asmlinkage void do_spurious_interrupt_bu
  {
  }
@@ -815,8 +832,8 @@ References: 191115
  
  /*
   * 'math_state_restore()' saves the current math information in the
---- sle11-2009-06-04.orig/drivers/xen/core/smpboot.c   2009-06-04 10:47:28.000000000 +0200
-+++ sle11-2009-06-04/drivers/xen/core/smpboot.c        2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/drivers/xen/core/smpboot.c   2009-06-04 10:47:28.000000000 +0200
++++ sle11-2009-08-26/drivers/xen/core/smpboot.c        2009-06-04 10:47:37.000000000 +0200
 @@ -346,7 +346,7 @@ void __init smp_prepare_cpus(unsigned in
         * Here we can be sure that there is an IO-APIC in the system. Let's
         * go and set it up:
@@ -826,8 +843,8 @@ References: 191115
                setup_IO_APIC();
  #endif
  }
---- sle11-2009-06-04.orig/include/asm-x86/apic.h       2009-06-04 10:18:34.000000000 +0200
-+++ sle11-2009-06-04/include/asm-x86/apic.h    2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/include/asm-x86/apic.h       2008-12-01 11:11:08.000000000 +0100
++++ sle11-2009-08-26/include/asm-x86/apic.h    2009-06-04 10:47:37.000000000 +0200
 @@ -5,7 +5,9 @@
  #include <linux/delay.h>
  
@@ -854,8 +871,8 @@ References: 191115
  
  extern int lapic_get_maxlvt(void);
  extern void clear_local_APIC(void);
---- sle11-2009-06-04.orig/include/asm-x86/apicdef.h    2009-06-04 10:17:48.000000000 +0200
-+++ sle11-2009-06-04/include/asm-x86/apicdef.h 2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/include/asm-x86/apicdef.h    2009-08-26 11:46:28.000000000 +0200
++++ sle11-2009-08-26/include/asm-x86/apicdef.h 2009-06-04 10:47:37.000000000 +0200
 @@ -1,6 +1,8 @@
  #ifndef _ASM_X86_APICDEF_H
  #define _ASM_X86_APICDEF_H
@@ -900,8 +917,8 @@ References: 191115
  #ifdef CONFIG_X86_32
   #define BAD_APICID 0xFFu
  #else
---- sle11-2009-06-04.orig/include/asm-x86/ipi.h        2009-06-04 10:17:48.000000000 +0200
-+++ sle11-2009-06-04/include/asm-x86/ipi.h     2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/include/asm-x86/ipi.h        2009-08-26 11:46:28.000000000 +0200
++++ sle11-2009-08-26/include/asm-x86/ipi.h     2009-06-04 10:47:37.000000000 +0200
 @@ -1,6 +1,8 @@
  #ifndef __ASM_IPI_H
  #define __ASM_IPI_H
@@ -918,8 +935,8 @@ References: 191115
 +#endif /* CONFIG_XEN */
 +
  #endif /* __ASM_IPI_H */
---- sle11-2009-06-04.orig/include/asm-x86/mach-xen/asm/fixmap_32.h     2009-06-04 10:21:39.000000000 +0200
-+++ sle11-2009-06-04/include/asm-x86/mach-xen/asm/fixmap_32.h  2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/include/asm-x86/mach-xen/asm/fixmap_32.h     2009-06-04 10:21:39.000000000 +0200
++++ sle11-2009-08-26/include/asm-x86/mach-xen/asm/fixmap_32.h  2009-06-04 10:47:37.000000000 +0200
 @@ -55,10 +55,10 @@ enum fixed_addresses {
        FIX_VDSO,
        FIX_DBGP_BASE,
@@ -932,8 +949,8 @@ References: 191115
  #ifdef CONFIG_X86_IO_APIC
        FIX_IO_APIC_BASE_0,
        FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS-1,
---- sle11-2009-06-04.orig/include/asm-x86/mach-xen/asm/fixmap_64.h     2009-06-04 10:21:39.000000000 +0200
-+++ sle11-2009-06-04/include/asm-x86/mach-xen/asm/fixmap_64.h  2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/include/asm-x86/mach-xen/asm/fixmap_64.h     2009-06-04 10:21:39.000000000 +0200
++++ sle11-2009-08-26/include/asm-x86/mach-xen/asm/fixmap_64.h  2009-06-04 10:47:37.000000000 +0200
 @@ -13,7 +13,6 @@
  
  #include <linux/kernel.h>
@@ -954,8 +971,8 @@ References: 191115
        FIX_IO_APIC_BASE_0,
        FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1,
  #endif
---- sle11-2009-06-04.orig/include/asm-x86/mach-xen/asm/smp.h   2009-06-04 10:46:32.000000000 +0200
-+++ sle11-2009-06-04/include/asm-x86/mach-xen/asm/smp.h        2009-06-04 10:47:37.000000000 +0200
+--- sle11-2009-08-26.orig/include/asm-x86/mach-xen/asm/smp.h   2008-11-04 14:07:28.000000000 +0100
++++ sle11-2009-08-26/include/asm-x86/mach-xen/asm/smp.h        2009-06-04 10:47:37.000000000 +0200
 @@ -16,7 +16,7 @@
  # endif
  #endif
@@ -975,7 +992,7 @@ References: 191115
  static inline int logical_smp_processor_id(void)
  {
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ sle11-2009-06-04/include/asm-x86/mach-xen/mach_apic.h      2009-06-04 10:47:37.000000000 +0200
++++ sle11-2009-08-26/include/asm-x86/mach-xen/mach_apic.h      2009-06-04 10:47:37.000000000 +0200
 @@ -0,0 +1,54 @@
 +#ifndef __ASM_MACH_APIC_H
 +#define __ASM_MACH_APIC_H
Timo's tree of IPFire 2.x