Merge branch 'core/header-fixes' into x86/headers

Conflicts:
	arch/x86/include/asm/setup.h

diff --cc arch/x86/include/asm/setup.h
index 45b4027,5a3a137..c230189
--- 1/arch/x86/include/asm/setup.h
--- 2/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@@ -48,14 -31,10 +33,8 @@@ struct x86_quirks 
        int (*update_genapic)(void);
  };
  
- extern struct x86_quirks *x86_quirks;
- extern unsigned long saved_video_mode;
- 
- #ifndef CONFIG_PARAVIRT
- #define paravirt_post_allocator_init()        do {} while (0)
- #endif
  #endif /* __ASSEMBLY__ */
  
 -#ifdef __KERNEL__
 -
  #ifdef __i386__
  
  #include <linux/pfn.h>

diff --cc arch/x86/include/asm/syscalls.h
Simple merge