summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/system.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-12-16 01:09:21 +0100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-12-16 01:09:21 +0100
commit43ca5d347acc0dcae988dbd38b5bb5a930744a75 (patch)
tree63dd3f2def7220aa0df7951553bbd18022ccb96b /arch/powerpc/include/asm/system.h
parentMerge branch 'ps3' into next (diff)
parentpowerpc/kdump: Only save CPU state first time through the secondary CPU captu... (diff)
downloadlinux-43ca5d347acc0dcae988dbd38b5bb5a930744a75.tar.xz
linux-43ca5d347acc0dcae988dbd38b5bb5a930744a75.zip
Merge branch 'kexec' into next
Diffstat (limited to 'arch/powerpc/include/asm/system.h')
-rw-r--r--arch/powerpc/include/asm/system.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
index f56a0a75d989..c377457d1b89 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);
extern void *cacheable_memcpy(void *, const void *, unsigned int);
extern int do_page_fault(struct pt_regs *, unsigned long, unsigned long);
extern void bad_page_fault(struct pt_regs *, unsigned long, int);
-extern int die(const char *, struct pt_regs *, long);
extern void _exception(int, struct pt_regs *, int, unsigned long);
+extern void die(const char *, struct pt_regs *, long);
extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
#ifdef CONFIG_BOOKE_WDT