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: Len Brown <len.brown@intel.com>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Sam Ravnborg <sam@ravnborg.org>

diff --git a/arch/sparc/include/asm/processor_32.h b/arch/sparc/include/asm/processor_32.h
index c1e01914fd98b53c48a4aee32dccaa2e7fbb0c82..2c7baa4c45050f56d6f32afed6c99dd764c63729 100644 (file)
--- a/arch/sparc/include/asm/processor_32.h
+++ b/arch/sparc/include/asm/processor_32.h
@@ -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
 

diff --git a/arch/sparc/kernel/apc.c b/arch/sparc/kernel/apc.c
index 348fa1aeabce586fd16ff03fcc89689d20358683..eefda32b595ef6ff1344d21ebc664ca4a7f9f0fa 100644 (file)
--- a/arch/sparc/kernel/apc.c
+++ b/arch/sparc/kernel/apc.c
@@ -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)" : "");

diff --git a/arch/sparc/kernel/leon_pmc.c b/arch/sparc/kernel/leon_pmc.c
index 4e174321097d7a4af24eb0f5cd3bb4b1d5b37e53..708bca435219f1bf41853a250bd7a110f7f536be 100644 (file)
--- a/arch/sparc/kernel/leon_pmc.c
+++ b/arch/sparc/kernel/leon_pmc.c
@@ -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");
        }

diff --git a/arch/sparc/kernel/pmc.c b/arch/sparc/kernel/pmc.c
index dcbb62f63068b53497393a959bfe5b063a014f60..8b7297faca79b18d24fd62cb32529d90ff27ab71 100644 (file)
--- a/arch/sparc/kernel/pmc.c
+++ b/arch/sparc/kernel/pmc.c
@@ -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);

diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
index be8e862badaff0db6e4eb0ae8e9d6e93e18d429f..62eede13831a2685694986165c5ac11a36daceda 100644 (file)
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
@@ -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();
                }