aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2005-09-12 12:49:24 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-12 13:50:57 -0400
commit1209140c3c70aaa32d1a0462d79557f2a44a4ef8 (patch)
tree2dc299ad357392f7d81e85131615bb61f0b1a14c /include/asm-x86_64
parent059bf0f6c33058680e4381f17d554baaa4f45d68 (diff)
[PATCH] x86-64: Safe interrupts in oops_begin/end
Rather than blindly re-enabling interrupts in oops_end(), save their state in oope_begin() and then restore that state. Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-x86_64')
-rw-r--r--include/asm-x86_64/kdebug.h4
-rw-r--r--include/asm-x86_64/proto.h3
2 files changed, 2 insertions, 5 deletions
diff --git a/include/asm-x86_64/kdebug.h b/include/asm-x86_64/kdebug.h
index b90341994d80..f604e84c5303 100644
--- a/include/asm-x86_64/kdebug.h
+++ b/include/asm-x86_64/kdebug.h
@@ -46,7 +46,7 @@ extern void die(const char *,struct pt_regs *,long);
46extern void __die(const char *,struct pt_regs *,long); 46extern void __die(const char *,struct pt_regs *,long);
47extern void show_registers(struct pt_regs *regs); 47extern void show_registers(struct pt_regs *regs);
48extern void dump_pagetable(unsigned long); 48extern void dump_pagetable(unsigned long);
49extern void oops_begin(void); 49extern unsigned long oops_begin(void);
50extern void oops_end(void); 50extern void oops_end(unsigned long);
51 51
52#endif 52#endif
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h
index 764b5f822ce2..dbb37b0adb43 100644
--- a/include/asm-x86_64/proto.h
+++ b/include/asm-x86_64/proto.h
@@ -74,9 +74,6 @@ extern void acpi_reserve_bootmem(void);
74 74
75extern void swap_low_mappings(void); 75extern void swap_low_mappings(void);
76 76
77extern void oops_begin(void);
78extern void die(const char *,struct pt_regs *,long);
79extern void __die(const char * str, struct pt_regs * regs, long err);
80extern void __show_regs(struct pt_regs * regs); 77extern void __show_regs(struct pt_regs * regs);
81extern void show_regs(struct pt_regs * regs); 78extern void show_regs(struct pt_regs * regs);
82 79