Merge branch 'x86/cpu' into x86/core

Conflicts:

	arch/x86/kernel/cpu/feature_names.c
	include/asm-x86/cpufeature.h

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

diff --cc arch/x86/kernel/apic_32.c
Simple merge

diff --cc arch/x86/kernel/apic_64.c
Simple merge

diff --cc arch/x86/kernel/cpu/common_64.c
Simple merge

diff --cc arch/x86/kernel/cpu/mtrr/main.c
Simple merge

diff --cc arch/x86/kernel/genx2apic_uv_x.c
Simple merge

diff --cc arch/x86/kernel/mpparse.c
Simple merge

diff --cc arch/x86/kernel/numaq_32.c
Simple merge

diff --cc arch/x86/kernel/paravirt.c
Simple merge

diff --cc arch/x86/kernel/process_32.c
Simple merge

diff --cc arch/x86/kernel/process_64.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/kernel/smpboot.c
Simple merge

diff --cc arch/x86/mm/ioremap.c
Simple merge

diff --cc include/asm-x86/amd_iommu_types.h
Simple merge

diff --cc include/asm-x86/atomic_64.h
Simple merge

diff --cc include/asm-x86/bugs.h
index 4761c46,00e4a0c..ae514c7
--- 1/include/asm-x86/bugs.h
--- 2/include/asm-x86/bugs.h
+++ b/include/asm-x86/bugs.h
@@@ -1,7 -1,12 +1,12 @@@
 -#ifndef _ASM_X86_BUGS_H
 -#define _ASM_X86_BUGS_H
 +#ifndef ASM_X86__BUGS_H
 +#define ASM_X86__BUGS_H
  
  extern void check_bugs(void);
+ 
+ #ifdef CONFIG_CPU_SUP_INTEL_32
  int ppro_with_ram_bug(void);
+ #else
+ static inline int ppro_with_ram_bug(void) { return 0; }
+ #endif
  
 -#endif /* _ASM_X86_BUGS_H */
 +#endif /* ASM_X86__BUGS_H */

diff --cc include/asm-x86/cpufeature.h
Simple merge

diff --cc include/asm-x86/genapic_32.h
index 4904c67,754d635..34280f0
--- 1/include/asm-x86/genapic_32.h
--- 2/include/asm-x86/genapic_32.h
+++ b/include/asm-x86/genapic_32.h
@@@ -118,6 -118,7 +118,7 @@@ enum uv_system_type {UV_NONE, UV_LEGACY
  #define get_uv_system_type()          UV_NONE
  #define is_uv_system()                        0
  #define uv_wakeup_secondary(a, b)     1
+ #define uv_system_init()              do {} while (0)
  
  
 -#endif
 +#endif /* ASM_X86__GENAPIC_32_H */

diff --cc include/asm-x86/genapic_64.h
Simple merge

diff --cc include/asm-x86/geode.h
Simple merge

diff --cc include/asm-x86/io.h
Simple merge

diff --cc include/asm-x86/irq_vectors.h
Simple merge

diff --cc include/asm-x86/kexec.h
Simple merge

diff --cc include/asm-x86/mce.h
Simple merge

diff --cc include/asm-x86/mman.h
Simple merge

diff --cc include/asm-x86/mmconfig.h
Simple merge

diff --cc include/asm-x86/mmzone_32.h
Simple merge

diff --cc include/asm-x86/msr.h
Simple merge

diff --cc include/asm-x86/percpu.h
Simple merge

diff --cc include/asm-x86/pgtable_64.h
Simple merge

diff --cc include/asm-x86/processor.h
Simple merge

diff --cc include/asm-x86/required-features.h
Simple merge

diff --cc include/asm-x86/spinlock.h
Simple merge

diff --cc include/asm-x86/uv/uv_bau.h
Simple merge

diff --cc include/asm-x86/xen/hypervisor.h
Simple merge