]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
authorIngo Molnar <mingo@elte.hu>
Mon, 6 Oct 2008 14:18:26 +0000 (16:18 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 6 Oct 2008 16:06:53 +0000 (18:06 +0200)
Conflicts:
arch/x86/kernel/process_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
26 files changed:
1  2 
arch/x86/kernel/cpu/mtrr/main.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/kernel/ptrace.c
arch/x86/kernel/signal_64.c
arch/x86/kernel/smpboot.c
arch/x86/mm/init_32.c
arch/x86/mm/ioremap.c
include/asm-x86/apic.h
include/asm-x86/e820.h
include/asm-x86/hw_irq.h
include/asm-x86/i387.h
include/asm-x86/io.h
include/asm-x86/io_64.h
include/asm-x86/page_32.h
include/asm-x86/page_64.h
include/asm-x86/pgtable.h
include/asm-x86/pgtable_32.h
include/asm-x86/processor.h
include/asm-x86/ptrace.h
include/asm-x86/setup.h
include/asm-x86/signal.h
include/asm-x86/smp.h
include/asm-x86/time.h
include/asm-x86/timer.h
include/asm-x86/traps.h

Simple merge
index 491eb1a7e0739f2b500c323308e4e7487fa04814,7b6e44a7c6248340482a317d20861b1292b1a246..c8609dea443fbc71cf48c16c2bdfe926cf47f387
@@@ -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");
  
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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 2a891a704719163a0c08d2d7dd2f07303a54691c,b60fab546da7625d388e3c8d085dfa266fee7b01..2ccebc6fb0b0143c9605ab548662718dacb8b97d
@@@ -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 */