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

Commit d472ba84 authored by Len Brown's avatar Len Brown
Browse files

sparc idle: rename pm_idle to sparc_idle 



(pm_idle)() is being removed from linux/pm.h
because Linux does not have such a cross-architecture concept.

sparc uses an idle function pointer in its architecture
specific code.  So we re-name sparc use of pm_idle to sparc_idle.

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 3738fa5b

arch/sparc/include/asm/processor_32.h

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ extern unsigned long get_wchan(struct task_struct *); 
extern struct task_struct *last_task_used_math;



#define cpu_relax()	barrier()

extern void (*sparc_idle)(void);



#endif

arch/sparc/kernel/apc.c

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <asm/uaccess.h>

#include <asm/auxio.h>

#include <asm/apc.h>

#include <asm/processor.h>



/* Debugging

 *
@@ -158,7 +159,7 @@ static int apc_probe(struct platform_device *op) 


	/* Assign power management IDLE handler */

	if (!apc_no_idle)

		pm_idle = apc_swift_idle;	

		sparc_idle = apc_swift_idle;



	printk(KERN_INFO "%s: power management initialized%s\n", 

	       APC_DEVNAME, apc_no_idle ? " (CPU idle disabled)" : "");

arch/sparc/kernel/leon_pmc.c

+3 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <asm/leon_amba.h>

#include <asm/cpu_type.h>

#include <asm/leon.h>

#include <asm/processor.h>



/* List of Systems that need fixup instructions around power-down instruction */

unsigned int pmc_leon_fixup_ids[] = {
@@ -69,9 +70,9 @@ static int __init leon_pmc_install(void) 
	if (sparc_cpu_model == sparc_leon) {

		/* Assign power management IDLE handler */

		if (pmc_leon_need_fixup())

			pm_idle = pmc_leon_idle_fixup;

			sparc_idle = pmc_leon_idle_fixup;

		else

			pm_idle = pmc_leon_idle;

			sparc_idle = pmc_leon_idle;



		printk(KERN_INFO "leon: power management initialized\n");

	}

arch/sparc/kernel/pmc.c

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <asm/oplib.h>

#include <asm/uaccess.h>

#include <asm/auxio.h>

#include <asm/processor.h>



/* Debug

 *
@@ -63,7 +64,7 @@ static int pmc_probe(struct platform_device *op) 


#ifndef PMC_NO_IDLE

	/* Assign power management IDLE handler */

	pm_idle = pmc_swift_idle;

	sparc_idle = pmc_swift_idle;

#endif



	printk(KERN_INFO "%s: power management initialized\n", PMC_DEVNAME);

arch/sparc/kernel/process_32.c

+3 −4
Original line number Diff line number Diff line
@@ -43,8 +43,7 @@ 
 * Power management idle function 

 * Set in pm platform drivers (apc.c and pmc.c)

 */

void (*pm_idle)(void);

EXPORT_SYMBOL(pm_idle);

void (*sparc_idle)(void);



/* 

 * Power-off handler instantiation for pm.h compliance
@@ -75,8 +74,8 @@ void cpu_idle(void) 
	/* endless idle loop with no priority at all */

	for (;;) {

		while (!need_resched()) {

			if (pm_idle)

				(*pm_idle)();

			if (sparc_idle)

				(*sparc_idle)();

			else

				cpu_relax();

		}