Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17a6392d authored by Paul Mackerras's avatar Paul Mackerras
Browse files

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: default avatarPaul Mackerras <paulus@samba.org>
parent d85b525e

arch/ppc/kernel/idle.c

+1 −1
Original line number Diff line number Diff line
@@ -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[]={

	{

arch/ppc64/kernel/maple_time.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}

include/asm-powerpc/system.h

+2 −0
Original line number Diff line number Diff line
@@ -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

 *

include/asm-ppc/machdep.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/asm-ppc/open_pic.h

+1 −2
Original line number Diff line number Diff line
@@ -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);