diff options
| author | Jaswinder Singh <jaswinder@infradead.org> | 2008-12-18 13:33:56 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-18 16:33:13 -0500 |
| commit | d1769d5475176124af04fa69848b022c98c4bc37 (patch) | |
| tree | 0de962f3bbcddefcc2edac6aad204660ecc61b59 | |
| parent | f0bc2202e0373eb8e9b1ddbec930e2e681357db8 (diff) | |
x86: traps.c declare functions before they get used
Impact: cleanup
In asm/traps.h :-
do_double_fault : added under X86_64
sync_regs : added under X86_64
math_error : moved out from X86_32 as it is common for both 32 and 64 bit
math_emulate : moved from X86_32 as it is common for both 32 and 64 bit
smp_thermal_interrupt : added under X86_64
mce_threshold_interrupt : added under X86_64
Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/include/asm/traps.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h index 45dee286e45c..2ee0a3bceedf 100644 --- a/arch/x86/include/asm/traps.h +++ b/arch/x86/include/asm/traps.h | |||
| @@ -46,6 +46,10 @@ dotraplinkage void do_coprocessor_segment_overrun(struct pt_regs *, long); | |||
| 46 | dotraplinkage void do_invalid_TSS(struct pt_regs *, long); | 46 | dotraplinkage void do_invalid_TSS(struct pt_regs *, long); |
| 47 | dotraplinkage void do_segment_not_present(struct pt_regs *, long); | 47 | dotraplinkage void do_segment_not_present(struct pt_regs *, long); |
| 48 | dotraplinkage void do_stack_segment(struct pt_regs *, long); | 48 | dotraplinkage void do_stack_segment(struct pt_regs *, long); |
| 49 | #ifdef CONFIG_X86_64 | ||
| 50 | dotraplinkage void do_double_fault(struct pt_regs *, long); | ||
| 51 | asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *); | ||
| 52 | #endif | ||
| 49 | dotraplinkage void do_general_protection(struct pt_regs *, long); | 53 | dotraplinkage void do_general_protection(struct pt_regs *, long); |
| 50 | dotraplinkage void do_page_fault(struct pt_regs *, unsigned long); | 54 | dotraplinkage void do_page_fault(struct pt_regs *, unsigned long); |
| 51 | dotraplinkage void do_spurious_interrupt_bug(struct pt_regs *, long); | 55 | dotraplinkage void do_spurious_interrupt_bug(struct pt_regs *, long); |
| @@ -72,10 +76,13 @@ static inline int get_si_code(unsigned long condition) | |||
| 72 | extern int panic_on_unrecovered_nmi; | 76 | extern int panic_on_unrecovered_nmi; |
| 73 | extern int kstack_depth_to_print; | 77 | extern int kstack_depth_to_print; |
| 74 | 78 | ||
| 75 | #ifdef CONFIG_X86_32 | ||
| 76 | void math_error(void __user *); | 79 | void math_error(void __user *); |
| 77 | unsigned long patch_espfix_desc(unsigned long, unsigned long); | ||
| 78 | asmlinkage void math_emulate(long); | 80 | asmlinkage void math_emulate(long); |
| 81 | #ifdef CONFIG_X86_32 | ||
| 82 | unsigned long patch_espfix_desc(unsigned long, unsigned long); | ||
| 83 | #else | ||
| 84 | asmlinkage void smp_thermal_interrupt(void); | ||
| 85 | asmlinkage void mce_threshold_interrupt(void); | ||
| 79 | #endif | 86 | #endif |
| 80 | 87 | ||
| 81 | #endif /* _ASM_X86_TRAPS_H */ | 88 | #endif /* _ASM_X86_TRAPS_H */ |
