lkml.org 
[lkml]   [2008]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] x86: traps.c declare functions before they get used

* Jaswinder Singh <jaswinder@infradead.org> wrote:

> Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
>
> 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
> smp_thermal_interrupt : added under X86_64
> mce_threshold_interrupt : added under X86_64
> math_emulate : moved from X86_32 to MATH_EMULATION
> ---
> arch/x86/include/asm/traps.h | 11 ++++++++++-
> 1 files changed, 10 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h
> index 45dee28..d8a201b 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);
> dotraplinkage void do_invalid_TSS(struct pt_regs *, long);
> dotraplinkage void do_segment_not_present(struct pt_regs *, long);
> dotraplinkage void do_stack_segment(struct pt_regs *, long);
> +#ifdef CONFIG_X86_64
> +dotraplinkage void do_double_fault(struct pt_regs *, long);
> +asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *);
> +#endif
> dotraplinkage void do_general_protection(struct pt_regs *, long);
> dotraplinkage void do_page_fault(struct pt_regs *, unsigned long);
> dotraplinkage void do_spurious_interrupt_bug(struct pt_regs *, long);
> @@ -72,9 +76,14 @@ static inline int get_si_code(unsigned long condition)
> extern int panic_on_unrecovered_nmi;
> extern int kstack_depth_to_print;
>
> -#ifdef CONFIG_X86_32
> void math_error(void __user *);
> +#ifdef CONFIG_X86_32
> unsigned long patch_espfix_desc(unsigned long, unsigned long);
> +#else
> +asmlinkage void smp_thermal_interrupt(void);
> +asmlinkage void mce_threshold_interrupt(void);
> +#endif
> +#ifndef CONFIG_MATH_EMULATION
> asmlinkage void math_emulate(long);
> #endif

uhm, shouldnt that #ifndef CONFIG_MATH_EMULATION be #ifdef
CONFIG_MATH_EMULATION?

Ingo


\
 
 \ /
  Last update: 2008-12-16 21:27    [W:1.770 / U:0.080 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site