diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-16 11:09:21 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-16 11:09:21 +1100 |
| commit | 43ca5d347acc0dcae988dbd38b5bb5a930744a75 (patch) | |
| tree | 63dd3f2def7220aa0df7951553bbd18022ccb96b /arch/powerpc/include/asm/system.h | |
| parent | efdad722ef4d69eaaa8335deab0b6f55f52d7e57 (diff) | |
| parent | 2440c01e10f07adcbc2094ba12ae4ad6094bd2b6 (diff) | |
| download | linux-stable-43ca5d347acc0dcae988dbd38b5bb5a930744a75.tar.gz linux-stable-43ca5d347acc0dcae988dbd38b5bb5a930744a75.tar.bz2 linux-stable-43ca5d347acc0dcae988dbd38b5bb5a930744a75.zip | |
Merge branch 'kexec' into next
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 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 |