mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
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>
This commit is contained in:
parent
d85b525e6e
commit
17a6392d30
6 changed files with 8 additions and 7 deletions
|
@ -75,7 +75,7 @@ void cpu_idle(void)
|
|||
/*
|
||||
* Register the sysctl to set/clear powersave_nap.
|
||||
*/
|
||||
extern unsigned long powersave_nap;
|
||||
extern int powersave_nap;
|
||||
|
||||
static ctl_table powersave_nap_ctl_table[]={
|
||||
{
|
||||
|
|
|
@ -172,7 +172,7 @@ unsigned long __init maple_get_boot_time(void)
|
|||
}
|
||||
|
||||
maple_get_rtc_time(&tm);
|
||||
return mktime(time->tm_year+1900, time->tm_mon+1, time->tm_mday,
|
||||
time->tm_hour, time->tm_min, time->tm_sec);
|
||||
return mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
|
||||
tm.tm_hour, tm.tm_min, tm.tm_sec);
|
||||
}
|
||||
|
||||
|
|
|
@ -180,6 +180,8 @@ extern struct task_struct *_switch(struct thread_struct *prev,
|
|||
extern unsigned int rtas_data;
|
||||
extern int mem_init_done; /* set on boot once kmalloc can be called */
|
||||
|
||||
extern int powersave_nap; /* set if nap mode can be used in idle loop */
|
||||
|
||||
/*
|
||||
* Atomic exchange
|
||||
*
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -36,7 +36,7 @@ struct pci_controller {
|
|||
|
||||
struct pci_ops *ops;
|
||||
volatile unsigned int __iomem *cfg_addr;
|
||||
volatile unsigned char __iomem *cfg_data;
|
||||
volatile void __iomem *cfg_data;
|
||||
|
||||
/* Currently, we limit ourselves to 1 IO range and 3 mem
|
||||
* ranges since the common pci_bus structure can't handle more
|
||||
|
|
Loading…
Reference in a new issue