Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ac8d51f authored by Jaswinder Singh's avatar Jaswinder Singh Committed by Ingo Molnar
Browse files

x86: introducing asm-x86/traps.h 



Declaring x86 traps under one hood.
Declaring x86 do_traps before defining them.

Signed-off-by: default avatarJaswinder Singh <jaswinder@infradead.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Alexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3f9b5cc0

arch/x86/kernel/traps_32.c

+1 −20
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include <asm/nmi.h>

#include <asm/smp.h>

#include <asm/io.h>

#include <asm/traps.h>



#include "mach_traps.h"
@@ -77,26 +78,6 @@ char ignore_fpu_irq; 
gate_desc idt_table[256]

	__attribute__((__section__(".data.idt"))) = { { { { 0, 0 } } }, };



asmlinkage void divide_error(void);

asmlinkage void debug(void);

asmlinkage void nmi(void);

asmlinkage void int3(void);

asmlinkage void overflow(void);

asmlinkage void bounds(void);

asmlinkage void invalid_op(void);

asmlinkage void device_not_available(void);

asmlinkage void coprocessor_segment_overrun(void);

asmlinkage void invalid_TSS(void);

asmlinkage void segment_not_present(void);

asmlinkage void stack_segment(void);

asmlinkage void general_protection(void);

asmlinkage void page_fault(void);

asmlinkage void coprocessor_error(void);

asmlinkage void simd_coprocessor_error(void);

asmlinkage void alignment_check(void);

asmlinkage void spurious_interrupt_bug(void);

asmlinkage void machine_check(void);



int panic_on_unrecovered_nmi;

int kstack_depth_to_print = 24;

static unsigned int code_bytes = 64;

arch/x86/kernel/traps_64.c

+1 −21
Original line number Diff line number Diff line
@@ -51,30 +51,10 @@ 
#include <asm/pgalloc.h>

#include <asm/proto.h>

#include <asm/pda.h>

#include <asm/traps.h>



#include <mach_traps.h>



asmlinkage void divide_error(void);

asmlinkage void debug(void);

asmlinkage void nmi(void);

asmlinkage void int3(void);

asmlinkage void overflow(void);

asmlinkage void bounds(void);

asmlinkage void invalid_op(void);

asmlinkage void device_not_available(void);

asmlinkage void double_fault(void);

asmlinkage void coprocessor_segment_overrun(void);

asmlinkage void invalid_TSS(void);

asmlinkage void segment_not_present(void);

asmlinkage void stack_segment(void);

asmlinkage void general_protection(void);

asmlinkage void page_fault(void);

asmlinkage void coprocessor_error(void);

asmlinkage void simd_coprocessor_error(void);

asmlinkage void alignment_check(void);

asmlinkage void spurious_interrupt_bug(void);

asmlinkage void machine_check(void);



int panic_on_unrecovered_nmi;

int kstack_depth_to_print = 12;

static unsigned int code_bytes = 64;

include/asm-x86/traps.h

0 → 100644
+66 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_TRAPS_H

#define _ASM_X86_TRAPS_H



/* Common in X86_32 and X86_64 */

asmlinkage void divide_error(void);

asmlinkage void debug(void);

asmlinkage void nmi(void);

asmlinkage void int3(void);

asmlinkage void overflow(void);

asmlinkage void bounds(void);

asmlinkage void invalid_op(void);

asmlinkage void device_not_available(void);

asmlinkage void coprocessor_segment_overrun(void);

asmlinkage void invalid_TSS(void);

asmlinkage void segment_not_present(void);

asmlinkage void stack_segment(void);

asmlinkage void general_protection(void);

asmlinkage void page_fault(void);

asmlinkage void coprocessor_error(void);

asmlinkage void simd_coprocessor_error(void);

asmlinkage void alignment_check(void);

asmlinkage void spurious_interrupt_bug(void);

#ifdef CONFIG_X86_MCE

asmlinkage void machine_check(void);

#endif /* CONFIG_X86_MCE */



void do_divide_error(struct pt_regs *, long);

void do_overflow(struct pt_regs *, long);

void do_bounds(struct pt_regs *, long);

void do_coprocessor_segment_overrun(struct pt_regs *, long);

void do_invalid_TSS(struct pt_regs *, long);

void do_segment_not_present(struct pt_regs *, long);

void do_stack_segment(struct pt_regs *, long);

void do_alignment_check(struct pt_regs *, long);

void do_invalid_op(struct pt_regs *, long);

void do_general_protection(struct pt_regs *, long);

void do_nmi(struct pt_regs *, long);



extern int panic_on_unrecovered_nmi;

extern int kstack_depth_to_print;



#ifdef CONFIG_X86_32



void do_iret_error(struct pt_regs *, long);

void do_int3(struct pt_regs *, long);

void do_debug(struct pt_regs *, long);

void math_error(void __user *);

void do_coprocessor_error(struct pt_regs *, long);

void do_simd_coprocessor_error(struct pt_regs *, long);

void do_spurious_interrupt_bug(struct pt_regs *, long);

unsigned long patch_espfix_desc(unsigned long, unsigned long);

asmlinkage void math_emulate(long);



#else /* CONFIG_X86_32 */



asmlinkage void double_fault(void);



asmlinkage void do_int3(struct pt_regs *, long);

asmlinkage void do_stack_segment(struct pt_regs *, long);

asmlinkage void do_debug(struct pt_regs *, unsigned long);

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 *);



#endif /* CONFIG_X86_32 */

#endif /* _ASM_X86_TRAPS_H */