Imported linux-2.6.27.39 suse/xen patches.

[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.arch / x2APIC_PATCH_25_2_of_41_c535b6a1a685eb23f96e2c221777d6c1e05080d5

diff --git a/src/patches/suse-2.6.27.31/patches.arch/x2APIC_PATCH_25_2_of_41_c535b6a1a685eb23f96e2c221777d6c1e05080d5 b/src/patches/suse-2.6.27.31/patches.arch/x2APIC_PATCH_25_2_of_41_c535b6a1a685eb23f96e2c221777d6c1e05080d5
deleted file mode 100644 (file)
index 0787fde..0000000
--- a/src/patches/suse-2.6.27.31/patches.arch/x2APIC_PATCH_25_2_of_41_c535b6a1a685eb23f96e2c221777d6c1e05080d5
+++ /dev/null
@@ -1,93 +0,0 @@
-From: Yinghai Lu <yhlu.kernel@gmail.com>
-Subject: x86: let 32bit use apic_ops too
-References: fate #303948 and fate #303984
-Patch-Mainline: queued for .28
-Commit-ID: c535b6a1a685eb23f96e2c221777d6c1e05080d5
-
-Signed-off-by: Thomas Renninger <trenn@suse.de>
-
-Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
-Cc: Suresh Siddha <suresh.b.siddha@intel.com>
-Signed-off-by: Ingo Molnar <mingo@elte.hu>
-
----
- arch/x86/kernel/apic_32.c |   38 ++++++++++++++++++++++++++++++--------
- include/asm-x86/apic.h    |    4 ----
- 2 files changed, 30 insertions(+), 12 deletions(-)
-
-Index: linux-2.6.26/arch/x86/kernel/apic_32.c
-===================================================================
---- linux-2.6.26.orig/arch/x86/kernel/apic_32.c
-+++ linux-2.6.26/arch/x86/kernel/apic_32.c
-@@ -145,19 +145,13 @@ static int modern_apic(void)
-       return lapic_get_version() >= 0x14;
- }
- 
--void apic_icr_write(u32 low, u32 id)
--{
--      apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(id));
--      apic_write(APIC_ICR, low);
--}
--
--void apic_wait_icr_idle(void)
-+void xapic_wait_icr_idle(void)
- {
-       while (apic_read(APIC_ICR) & APIC_ICR_BUSY)
-               cpu_relax();
- }
- 
--u32 safe_apic_wait_icr_idle(void)
-+u32 safe_xapic_wait_icr_idle(void)
- {
-       u32 send_status;
-       int timeout;
-@@ -173,6 +167,34 @@ u32 safe_apic_wait_icr_idle(void)
-       return send_status;
- }
- 
-+void xapic_icr_write(u32 low, u32 id)
-+{
-+      apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(id));
-+      apic_write(APIC_ICR, low);
-+}
-+
-+u64 xapic_icr_read(void)
-+{
-+      u32 icr1, icr2;
-+
-+      icr2 = apic_read(APIC_ICR2);
-+      icr1 = apic_read(APIC_ICR);
-+
-+      return icr1 | ((u64)icr2 << 32);
-+}
-+
-+static struct apic_ops xapic_ops = {
-+      .read = native_apic_mem_read,
-+      .write = native_apic_mem_write,
-+      .icr_read = xapic_icr_read,
-+      .icr_write = xapic_icr_write,
-+      .wait_icr_idle = xapic_wait_icr_idle,
-+      .safe_wait_icr_idle = safe_xapic_wait_icr_idle,
-+};
-+
-+struct apic_ops __read_mostly *apic_ops = &xapic_ops;
-+EXPORT_SYMBOL_GPL(apic_ops);
-+
- /**
-  * enable_NMI_through_LVT0 - enable NMI through local vector table 0
-  */
-Index: linux-2.6.26/include/asm-x86/apic.h
-===================================================================
---- linux-2.6.26.orig/include/asm-x86/apic.h
-+++ linux-2.6.26/include/asm-x86/apic.h
-@@ -49,10 +49,6 @@ extern int disable_apic;
- #ifdef CONFIG_PARAVIRT
- #include <asm/paravirt.h>
- #else
--#ifndef CONFIG_X86_64
--#define apic_write native_apic_mem_write
--#define apic_read native_apic_mem_read
--#endif
- #define setup_boot_clock setup_boot_APIC_clock
- #define setup_secondary_clock setup_secondary_APIC_clock
- #endif