diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-20 13:10:09 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-20 13:10:09 +0200 |
| commit | 17a6392d30b4ed89b88a47a318b2b6de6ae7b946 (patch) | |
| tree | 1c2a7dbbbce95db33bbfd2725fa19f2d2ecf6ecd /include/asm-ppc | |
| parent | ppc64: Use the merged mpic.c (diff) | |
| download | linux-17a6392d30b4ed89b88a47a318b2b6de6ae7b946.tar.xz linux-17a6392d30b4ed89b88a47a318b2b6de6ae7b946.zip | |
powerpc/ppc/ppc64: Various compile fixes.
This declares powersave_nap in system.h and makes it an int everywhere,
fixes typos for the maple platform, fixes a couple of places where
I missed removing the last two arguments from a message_pass function,
and makes ppc64 consistent with ppc32 in the type of the
pci_bridge.cfg_data field.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/machdep.h | 2 | ||||
| -rw-r--r-- | include/asm-ppc/open_pic.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-ppc/machdep.h b/include/asm-ppc/machdep.h index 1d4ab70a56f3..6c6d23abbe91 100644 --- a/include/asm-ppc/machdep.h +++ b/include/asm-ppc/machdep.h @@ -167,7 +167,7 @@ extern sys_ctrler_t sys_ctrler; #ifdef CONFIG_SMP struct smp_ops_t { - void (*message_pass)(int target, int msg, unsigned long data, int wait); + void (*message_pass)(int target, int msg); int (*probe)(void); void (*kick_cpu)(int nr); void (*setup_cpu)(int nr); diff --git a/include/asm-ppc/open_pic.h b/include/asm-ppc/open_pic.h index 7848aa610c05..ec2f46629ca2 100644 --- a/include/asm-ppc/open_pic.h +++ b/include/asm-ppc/open_pic.h @@ -58,8 +58,7 @@ extern int openpic_get_irq(struct pt_regs *regs); extern void openpic_reset_processor_phys(u_int cpumask); extern void openpic_setup_ISU(int isu_num, unsigned long addr); extern void openpic_cause_IPI(u_int ipi, cpumask_t cpumask); -extern void smp_openpic_message_pass(int target, int msg, unsigned long data, - int wait); +extern void smp_openpic_message_pass(int target, int msg); extern void openpic_set_k2_cascade(int irq); extern void openpic_set_priority(u_int pri); extern u_int openpic_get_priority(void); |