diff options
Diffstat (limited to 'arch/powerpc/include/asm/system.h')
-rw-r--r-- | arch/powerpc/include/asm/system.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h index e30a13d1ee76..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); | |||
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 |
@@ -221,6 +221,15 @@ extern unsigned long klimit; | |||
221 | extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask); | 221 | extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask); |
222 | 222 | ||
223 | extern int powersave_nap; /* set if nap mode can be used in idle loop */ | 223 | extern int powersave_nap; /* set if nap mode can be used in idle loop */ |
224 | void cpu_idle_wait(void); | ||
225 | |||
226 | #ifdef CONFIG_PSERIES_IDLE | ||
227 | extern void update_smt_snooze_delay(int snooze); | ||
228 | extern int pseries_notify_cpuidle_add_cpu(int cpu); | ||
229 | #else | ||
230 | static inline void update_smt_snooze_delay(int snooze) {} | ||
231 | static inline int pseries_notify_cpuidle_add_cpu(int cpu) { return 0; } | ||
232 | #endif | ||
224 | 233 | ||
225 | /* | 234 | /* |
226 | * Atomic exchange | 235 | * Atomic exchange |