Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1

Conflicts:
	arch/x86/kernel/process_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

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

diff --cc arch/x86/kernel/process_32.c
index 491eb1a7e0739f2b500c323308e4e7487fa04814,7b6e44a7c6248340482a317d20861b1292b1a246..c8609dea443fbc71cf48c16c2bdfe926cf47f387
--- 1/arch/x86/kernel/process_32.c
--- 2/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@@ -55,7 -55,8 +55,9 @@@
  #include <asm/tlbflush.h>
  #include <asm/cpu.h>
  #include <asm/kdebug.h>
 +#include <asm/idle.h>
+ #include <asm/syscalls.h>
+ #include <asm/smp.h>
  
  asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
  

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc include/asm-x86/traps.h
index 2a891a704719163a0c08d2d7dd2f07303a54691c,b60fab546da7625d388e3c8d085dfa266fee7b01..2ccebc6fb0b0143c9605ab548662718dacb8b97d
--- 1/include/asm-x86/traps.h
--- 2/include/asm-x86/traps.h
+++ b/include/asm-x86/traps.h
@@@ -62,5 -64,7 +64,7 @@@ asmlinkage void do_coprocessor_error(st
  asmlinkage void do_simd_coprocessor_error(struct pt_regs *);
  asmlinkage void do_spurious_interrupt_bug(struct pt_regs *);
  
+ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code);
+ 
  #endif /* CONFIG_X86_32 */
 -#endif /* _ASM_X86_TRAPS_H */
 +#endif /* ASM_X86__TRAPS_H */