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 | |
| parent | efdad722ef4d69eaaa8335deab0b6f55f52d7e57 (diff) | |
| parent | 2440c01e10f07adcbc2094ba12ae4ad6094bd2b6 (diff) | |
| download | blackbird-op-linux-43ca5d347acc0dcae988dbd38b5bb5a930744a75.tar.gz blackbird-op-linux-43ca5d347acc0dcae988dbd38b5bb5a930744a75.zip | |
Merge branch 'kexec' into next
Diffstat (limited to 'arch/powerpc/include/asm')
| -rw-r--r-- | arch/powerpc/include/asm/kexec.h | 7 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/system.h | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index f921eb121d39..16d7e33d35e9 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h @@ -49,7 +49,6 @@ #define KEXEC_STATE_REAL_MODE 2 #ifndef __ASSEMBLY__ -#include <linux/cpumask.h> #include <asm/reg.h> typedef void (*crash_shutdown_t)(void); @@ -73,11 +72,6 @@ extern void kexec_smp_wait(void); /* get and clear naca physid, wait for master to copy new code to 0 */ extern int crashing_cpu; extern void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *)); -extern cpumask_t cpus_in_sr; -static inline int kexec_sr_activated(int cpu) -{ - return cpumask_test_cpu(cpu, &cpus_in_sr); -} struct kimage; struct pt_regs; @@ -94,7 +88,6 @@ extern void reserve_crashkernel(void); extern void machine_kexec_mask_interrupts(void); #else /* !CONFIG_KEXEC */ -static inline int kexec_sr_activated(int cpu) { return 0; } static inline void crash_kexec_secondary(struct pt_regs *regs) { } static inline int overlaps_crashkernel(unsigned long start, unsigned long size) 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 |
