diff options
author | Anton Blanchard <anton@samba.org> | 2011-11-29 19:23:13 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-07 22:02:23 -0500 |
commit | 760ca4dc90e624eb8f7ff85a5925151e25577758 (patch) | |
tree | ecdcf387c51b5752206fb546945b1f1ccd27b884 /arch/powerpc/include/asm/system.h | |
parent | 8c27474a252e84e8a71ae4a43e18f0193a08e3f7 (diff) |
powerpc: Rework die()
Our die() code was based off a very old x86 version. Update it to
mirror the current x86 code.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include/asm/system.h')
-rw-r--r-- | arch/powerpc/include/asm/system.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h index e30a13d1ee76..d51c2c20dd23 100644 --- a/arch/powerpc/include/asm/system.h +++ b/arch/powerpc/include/asm/system.h | |||
@@ -193,8 +193,8 @@ extern void cacheable_memzero(void *p, unsigned int nb); | |||
193 | extern void *cacheable_memcpy(void *, const void *, unsigned int); | 193 | extern void *cacheable_memcpy(void *, const void *, unsigned int); |
194 | extern int do_page_fault(struct pt_regs *, unsigned long, unsigned long); | 194 | extern int do_page_fault(struct pt_regs *, unsigned long, unsigned long); |
195 | extern void bad_page_fault(struct pt_regs *, unsigned long, int); | 195 | extern void bad_page_fault(struct pt_regs *, unsigned long, int); |
196 | extern int die(const char *, struct pt_regs *, long); | ||
197 | extern void _exception(int, struct pt_regs *, int, unsigned long); | 196 | extern void _exception(int, struct pt_regs *, int, unsigned long); |
197 | extern void die(const char *, struct pt_regs *, long); | ||
198 | extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val); | 198 | extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val); |
199 | 199 | ||
200 | #ifdef CONFIG_BOOKE_WDT | 200 | #ifdef CONFIG_BOOKE_WDT |