Skip to content

Commit

Permalink
x86: mm/fault.c declare do_page_fault before they get used
Browse files Browse the repository at this point in the history
declared do_page_fault() in asm-x86/trap.h for both X86_32 and X86_64

removed do_invalid_op declaration from mm/fault.c as it is already declared in asm-x86/trap.h

Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
  • Loading branch information
Jaswinder Singh committed Jul 23, 2008
1 parent a80495e commit 70ef564
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 1 addition & 2 deletions arch/x86/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <asm/tlbflush.h>
#include <asm/proto.h>
#include <asm-generic/sections.h>
#include <asm/traps.h>

/*
* Page fault error code bits
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions include/asm-x86/traps.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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 */

0 comments on commit 70ef564

Please sign in to comment.