Merge branch 'x86/cpu' into x86/core
H. Peter Anvin [Thu, 4 Sep 2008 15:08:42 +0000 (08:08 -0700)]
Conflicts:

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

38 files changed:
1  2 
Documentation/kernel-parameters.txt
arch/x86/Kconfig
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/cpu/common_64.c
arch/x86/kernel/cpu/mtrr/main.c
arch/x86/kernel/genx2apic_uv_x.c
arch/x86/kernel/mpparse.c
arch/x86/kernel/numaq_32.c
arch/x86/kernel/paravirt.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/kernel/setup.c
arch/x86/kernel/smpboot.c
arch/x86/mm/ioremap.c
include/asm-x86/amd_iommu_types.h
include/asm-x86/atomic_64.h
include/asm-x86/bugs.h
include/asm-x86/cpufeature.h
include/asm-x86/genapic_32.h
include/asm-x86/genapic_64.h
include/asm-x86/geode.h
include/asm-x86/io.h
include/asm-x86/irq_vectors.h
include/asm-x86/kexec.h
include/asm-x86/mce.h
include/asm-x86/mman.h
include/asm-x86/mmconfig.h
include/asm-x86/mmzone_32.h
include/asm-x86/msr.h
include/asm-x86/percpu.h
include/asm-x86/pgtable_64.h
include/asm-x86/processor.h
include/asm-x86/required-features.h
include/asm-x86/spinlock.h
include/asm-x86/uv/uv_bau.h
include/asm-x86/xen/hypervisor.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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 */
Simple merge
@@@ -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 */
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge