diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-29 11:39:34 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-29 11:39:34 -0400 |
| commit | 83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18 (patch) | |
| tree | 5ba3bbbe977c2047658b41e22d6b2abd5686bf15 /include/asm-powerpc/kexec.h | |
| parent | 8638460540749ddb1beca9e9a68d655a6fe6df65 (diff) | |
| parent | d96299537e43681942ea272e00b0e529aa5b5fa4 (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'include/asm-powerpc/kexec.h')
| -rw-r--r-- | include/asm-powerpc/kexec.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-powerpc/kexec.h b/include/asm-powerpc/kexec.h index 8f7fd5cfec3..11cbdf81fd2 100644 --- a/include/asm-powerpc/kexec.h +++ b/include/asm-powerpc/kexec.h @@ -32,6 +32,7 @@ #endif #ifndef __ASSEMBLY__ +#include <linux/cpumask.h> #ifdef CONFIG_KEXEC @@ -109,7 +110,6 @@ static inline void crash_setup_regs(struct pt_regs *newregs, #define MAX_NOTE_BYTES 1024 -#ifdef __powerpc64__ extern void kexec_smp_wait(void); /* get and clear naca physid, wait for master to copy new code to 0 */ extern int crashing_cpu; @@ -119,7 +119,6 @@ static inline int kexec_sr_activated(int cpu) { return cpu_isset(cpu,cpus_in_sr); } -#endif /* __powerpc64 __ */ struct kimage; struct pt_regs; |