Refresh patches.xen/xen3-fixup-arch-x86.

suse-commit: f4b95ae9d80e3a0973434c4fb92b4efbe1d8b1bf

diff --cc Makefile
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/x86/kernel/cpu/intel_cacheinfo.c
index 2c06ab4,73d08ed..9bd2a44
--- 1/arch/x86/kernel/cpu/intel_cacheinfo.c
--- 2/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@@ -729,15 -723,17 +728,17 @@@ unsigned int __cpuinit init_intel_cache
  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;
-       unsigned long num_threads_sharing;
-       int index_msb, i, sibling;
+       struct _cpuid4_info *this_leaf;
+       int ret, i, sibling;
        struct cpuinfo_x86 *c = &cpu_data(cpu);
  
-       if ((index == 3) && (c->x86_vendor == X86_VENDOR_AMD)) {
+       ret = 0;
+       if (index == 3) {
+               ret = 1;
                for_each_cpu(i, cpu_llc_shared_mask(cpu)) {
                        if (!per_cpu(ici_cpuid4_info, i))
                                continue;

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/kvm/svm.c
Simple merge

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/watchdog/Kconfig
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc scripts/mod/file2alias.c
Simple merge