Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2012-03-05 01:01:47 -0500
committerJeff Mahoney <jeffm@suse.com>2012-03-05 01:01:47 -0500
commitf4b95ae9d80e3a0973434c4fb92b4efbe1d8b1bf (patch)
tree1d5630473c9b80f511f01247f0f1047b1c514466
parent639167fa8d45c1a092c2fff12c428bbac6495d19 (diff)
Refresh patches.xen/xen3-fixup-arch-x86.
-rw-r--r--patches.xen/xen3-fixup-arch-x8624
1 files changed, 15 insertions, 9 deletions
diff --git a/patches.xen/xen3-fixup-arch-x86 b/patches.xen/xen3-fixup-arch-x86
index 2b1ba11df3..434346b631 100644
--- a/patches.xen/xen3-fixup-arch-x86
+++ b/patches.xen/xen3-fixup-arch-x86
@@ -2,27 +2,33 @@ Subject: xen3 x86 build fixes.
From: jbeulich@novell.com
Patch-mainline: n/a
---- head-2011-11-16.orig/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-11-16 16:26:10.000000000 +0100
-+++ head-2011-11-16/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-11-17 10:49:01.000000000 +0100
-@@ -724,7 +724,7 @@ unsigned int __cpuinit init_intel_cachei
+---
+ arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +-
+ arch/x86/power/Makefile | 2 ++
+ arch/x86/power/cpu.c | 4 ----
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+
+--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
++++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
+@@ -723,7 +723,7 @@ unsigned int __cpuinit init_intel_cachei
static DEFINE_PER_CPU(struct _cpuid4_info *, ici_cpuid4_info);
#define CPUID4_INFO_IDX(x, y) (&((per_cpu(ici_cpuid4_info, x))[y]))
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) && !defined(CONFIG_XEN)
- static void __cpuinit cache_shared_cpu_map_setup(unsigned int cpu, int index)
+
+ static int __cpuinit cache_shared_amd_cpu_map_setup(unsigned int cpu, int index)
{
- struct _cpuid4_info *this_leaf, *sibling_leaf;
---- head-2011-11-16.orig/arch/x86/power/Makefile 2009-09-10 00:13:59.000000000 +0200
-+++ head-2011-11-16/arch/x86/power/Makefile 2011-01-31 17:01:57.000000000 +0100
+--- a/arch/x86/power/Makefile
++++ b/arch/x86/power/Makefile
@@ -5,3 +5,5 @@ CFLAGS_cpu.o := $(nostackp)
obj-$(CONFIG_PM_SLEEP) += cpu.o
obj-$(CONFIG_HIBERNATION) += hibernate_$(BITS).o hibernate_asm_$(BITS).o
+
+disabled-obj-$(CONFIG_XEN) := cpu.o
---- head-2011-11-16.orig/arch/x86/power/cpu.c 2011-11-16 17:03:21.000000000 +0100
-+++ head-2011-11-16/arch/x86/power/cpu.c 2011-11-17 10:46:30.000000000 +0100
+--- a/arch/x86/power/cpu.c
++++ b/arch/x86/power/cpu.c
@@ -130,7 +130,6 @@ static void do_fpu_end(void)
static void fix_processor_context(void)