diff options
Diffstat (limited to 'arch/x86_64/kernel/traps.c')
-rw-r--r-- | arch/x86_64/kernel/traps.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c index 0484a2ceac87..8c2ac41187c1 100644 --- a/arch/x86_64/kernel/traps.c +++ b/arch/x86_64/kernel/traps.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <linux/unwind.h> | 32 | #include <linux/unwind.h> |
33 | #include <linux/uaccess.h> | 33 | #include <linux/uaccess.h> |
34 | #include <linux/bug.h> | 34 | #include <linux/bug.h> |
35 | #include <linux/kdebug.h> | ||
35 | 36 | ||
36 | #include <asm/system.h> | 37 | #include <asm/system.h> |
37 | #include <asm/io.h> | 38 | #include <asm/io.h> |
@@ -39,7 +40,6 @@ | |||
39 | #include <asm/debugreg.h> | 40 | #include <asm/debugreg.h> |
40 | #include <asm/desc.h> | 41 | #include <asm/desc.h> |
41 | #include <asm/i387.h> | 42 | #include <asm/i387.h> |
42 | #include <asm/kdebug.h> | ||
43 | #include <asm/processor.h> | 43 | #include <asm/processor.h> |
44 | #include <asm/unwind.h> | 44 | #include <asm/unwind.h> |
45 | #include <asm/smp.h> | 45 | #include <asm/smp.h> |
@@ -71,22 +71,6 @@ asmlinkage void alignment_check(void); | |||
71 | asmlinkage void machine_check(void); | 71 | asmlinkage void machine_check(void); |
72 | asmlinkage void spurious_interrupt_bug(void); | 72 | asmlinkage void spurious_interrupt_bug(void); |
73 | 73 | ||
74 | ATOMIC_NOTIFIER_HEAD(die_chain); | ||
75 | EXPORT_SYMBOL(die_chain); | ||
76 | |||
77 | int register_die_notifier(struct notifier_block *nb) | ||
78 | { | ||
79 | vmalloc_sync_all(); | ||
80 | return atomic_notifier_chain_register(&die_chain, nb); | ||
81 | } | ||
82 | EXPORT_SYMBOL(register_die_notifier); /* used modular by kdb */ | ||
83 | |||
84 | int unregister_die_notifier(struct notifier_block *nb) | ||
85 | { | ||
86 | return atomic_notifier_chain_unregister(&die_chain, nb); | ||
87 | } | ||
88 | EXPORT_SYMBOL(unregister_die_notifier); /* used modular by kdb */ | ||
89 | |||
90 | static inline void conditional_sti(struct pt_regs *regs) | 74 | static inline void conditional_sti(struct pt_regs *regs) |
91 | { | 75 | { |
92 | if (regs->eflags & X86_EFLAGS_IF) | 76 | if (regs->eflags & X86_EFLAGS_IF) |