From 30403ab75b0640d78345031f5ac97602d7504b2b Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Date: Wed, 23 Jul 2008 17:36:37 +0530 Subject: [PATCH] --- yaml --- r: 110300 b: refs/heads/master c: 70ef56414ec7e01d787c8e959bb259845df4ee4f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/fault.c | 3 +-- trunk/include/asm-x86/traps.h | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 331ab8d7a924..af0205c542d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a80495ec927e8ec2b1ff085592bbe9bed77ffb3b +refs/heads/master: 70ef56414ec7e01d787c8e959bb259845df4ee4f diff --git a/trunk/arch/x86/mm/fault.c b/trunk/arch/x86/mm/fault.c index 455f3fe67b42..8f92cac4e6db 100644 --- a/trunk/arch/x86/mm/fault.c +++ b/trunk/arch/x86/mm/fault.c @@ -35,6 +35,7 @@ #include #include #include +#include /* * Page fault error code bits @@ -357,8 +358,6 @@ static int is_errata100(struct pt_regs *regs, unsigned long address) return 0; } -void do_invalid_op(struct pt_regs *, unsigned long); - static int is_f00f_bug(struct pt_regs *regs, unsigned long address) { #ifdef CONFIG_X86_F00F_BUG diff --git a/trunk/include/asm-x86/traps.h b/trunk/include/asm-x86/traps.h index a4b65a71bd66..b60fab546da7 100644 --- a/trunk/include/asm-x86/traps.h +++ b/trunk/include/asm-x86/traps.h @@ -51,6 +51,8 @@ void do_spurious_interrupt_bug(struct pt_regs *, long); unsigned long patch_espfix_desc(unsigned long, unsigned long); asmlinkage void math_emulate(long); +void do_page_fault(struct pt_regs *regs, unsigned long error_code); + #else /* CONFIG_X86_32 */ asmlinkage void double_fault(void); @@ -62,5 +64,7 @@ asmlinkage void do_coprocessor_error(struct pt_regs *); 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 */