From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 6 Oct 2008 14:18:26 +0000 (+0200)
Subject: Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
X-Git-Tag: v2.6.28-rc1~734^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0962f402af1bb0b53ccee626785d202a10c12fff;p=linux-2.6-omap-h63xx.git

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>
---

0962f402af1bb0b53ccee626785d202a10c12fff
diff --cc arch/x86/kernel/process_32.c
index 491eb1a7e07,7b6e44a7c62..c8609dea443
--- a/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 include/asm-x86/traps.h
index 2a891a70471,b60fab546da..2ccebc6fb0b
--- a/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 */