From: H. Peter Anvin <hpa@zytor.com>
Date: Thu, 4 Sep 2008 15:08:42 +0000 (-0700)
Subject: Merge branch 'x86/cpu' into x86/core
X-Git-Tag: v2.6.28-rc1~711^2^2~44^2~12
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7203781c98ad9147564d327de6f6513ad8fc0f4e;p=linux-2.6-omap-h63xx.git

Merge branch 'x86/cpu' into x86/core

Conflicts:

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

7203781c98ad9147564d327de6f6513ad8fc0f4e
diff --cc include/asm-x86/bugs.h
index 4761c461d23,00e4a0cd6f2..ae514c76a96
--- a/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/genapic_32.h
index 4904c672e4f,754d635f90f..34280f02766
--- a/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 */