diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-18 09:20:04 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-18 09:20:04 -0700 |
| commit | ed0da6fc9d3096f54c4a76737eeae57ac81418cf (patch) | |
| tree | 3bf45a192d991c5a5c80ac86eb333f9a4f796044 /include | |
| parent | 774bd8613d0188cda72408f8ffce258d73953cad (diff) | |
| parent | 9e8a9bc2d2c3ac3b8542cc5c2544248df6f3f1c5 (diff) | |
| download | op-kernel-dev-ed0da6fc9d3096f54c4a76737eeae57ac81418cf.zip op-kernel-dev-ed0da6fc9d3096f54c4a76737eeae57ac81418cf.tar.gz | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-powerpc/kexec.h | 3 | ||||
| -rw-r--r-- | include/asm-powerpc/rtas.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-powerpc/kexec.h b/include/asm-powerpc/kexec.h index 8f7fd5c..11cbdf8 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; diff --git a/include/asm-powerpc/rtas.h b/include/asm-powerpc/rtas.h index a33c6ac..82a27e9 100644 --- a/include/asm-powerpc/rtas.h +++ b/include/asm-powerpc/rtas.h @@ -170,6 +170,7 @@ extern int rtas_get_sensor(int sensor, int index, int *state); extern int rtas_get_power_level(int powerdomain, int *level); extern int rtas_set_power_level(int powerdomain, int level, int *setlevel); extern int rtas_set_indicator(int indicator, int index, int new_value); +extern int rtas_set_indicator_fast(int indicator, int index, int new_value); extern void rtas_progress(char *s, unsigned short hex); extern void rtas_initialize(void); |
