From: Len Brown <lenb@kernel.org>
To: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Len Brown <len.brown@intel.com>,
sparclinux@vger.kernel.org
Subject: [PATCH 04/16] sparc idle: rename pm_idle to sparc_idle
Date: Sun, 10 Feb 2013 00:58:11 -0500 [thread overview]
Message-ID: <3a242f58a5f40c60568cb1e3b13f119432203f48.1360475150.git.len.brown@intel.com> (raw)
In-Reply-To: <1360475903-30007-1-git-send-email-lenb@kernel.org>
In-Reply-To: <2b219d07e0f287c2c713f5465fc8646158fa986e.1360475150.git.len.brown@intel.com>
From: Len Brown <len.brown@intel.com>
(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.
Maybe some day, SPARC will cut over to cpuidle...
Signed-off-by: Len Brown <len.brown@intel.com>
Cc: sparclinux@vger.kernel.org
---
arch/sparc/include/asm/processor.h | 1 +
arch/sparc/kernel/apc.c | 3 ++-
arch/sparc/kernel/leon_pmc.c | 5 +++--
arch/sparc/kernel/pmc.c | 3 ++-
arch/sparc/kernel/process_32.c | 7 +++----
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/arch/sparc/include/asm/processor.h b/arch/sparc/include/asm/processor.h
index 2fe99e6..34baa35 100644
--- a/arch/sparc/include/asm/processor.h
+++ b/arch/sparc/include/asm/processor.h
@@ -7,5 +7,6 @@
#endif
#define nop() __asm__ __volatile__ ("nop")
+extern void (*sparc_idle)(void);
#endif
diff --git a/arch/sparc/kernel/apc.c b/arch/sparc/kernel/apc.c
index 348fa1a..eefda32 100644
--- 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 4e17432..708bca4 100644
--- 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 dcbb62f..8b7297f 100644
--- 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 be8e862..62eede1 100644
--- 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();
}
--
1.8.1.3.535.ga923c31
next prev parent reply other threads:[~2013-02-10 5:58 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-10 5:58 pm_idle cleanup patch series Len Brown
2013-02-10 5:58 ` [PATCH 01/16] APM idle: register apm_cpu_idle via cpuidle Len Brown
2013-02-10 5:58 ` [PATCH 02/16] x86 idle: rename global pm_idle to static x86_idle Len Brown
2013-02-10 5:58 ` [PATCH 03/16] sh idle: rename global pm_idle to static sh_idle Len Brown
2013-02-10 5:58 ` Len Brown [this message]
2013-02-10 23:08 ` [PATCH 04/16] sparc idle: rename pm_idle to sparc_idle David Miller
2013-02-10 5:58 ` [PATCH 05/16] blackfin idle: delete pm_idle Len Brown
2013-02-18 16:28 ` Lars-Peter Clausen
2013-02-20 17:53 ` Len Brown
2013-02-20 19:52 ` Rafael J. Wysocki
2013-02-20 19:53 ` Lars-Peter Clausen
2013-02-20 19:59 ` Rafael J. Wysocki
2013-02-20 20:21 ` Lars-Peter Clausen
2013-02-20 21:18 ` Rafael J. Wysocki
2013-02-21 9:56 ` [PATCH] blackfin idle: Fix compile error Lars-Peter Clausen
2013-02-21 16:24 ` Rafael J. Wysocki
2013-02-10 5:58 ` [PATCH 06/16] ARM idle: delete pm_idle Len Brown
2013-02-11 16:02 ` Catalin Marinas
2013-02-11 16:11 ` Russell King - ARM Linux
2013-02-11 22:42 ` Len Brown
2013-02-12 22:04 ` Kevin Hilman
2013-02-10 5:58 ` [PATCH 07/16] ARM64 " Len Brown
2013-02-12 11:03 ` Catalin Marinas
2013-02-10 5:58 ` [PATCH 08/16] cris idle: delete idle and pm_idle Len Brown
2013-02-11 8:42 ` Jesper Nilsson
2013-02-10 5:58 ` [PATCH 09/16] ia64 idle: delete pm_idle Len Brown
2013-02-21 10:15 ` Lars-Peter Clausen
2013-03-26 3:12 ` Brown, Len
2013-03-26 4:29 ` [PATCH] ia64 idle: delete (*idle)() Len Brown
2013-02-10 5:58 ` [PATCH 10/16] m32r idle: delete pm_idle, and other dead idle code Len Brown
2013-02-10 5:58 ` [PATCH 11/16] microblaze idle: delete pm_idle Len Brown
2013-02-21 10:15 ` [PATCH] microblaze idle: Fix compile error Lars-Peter Clausen
2013-02-21 16:25 ` Rafael J. Wysocki
2013-02-10 5:58 ` [PATCH 12/16] mn10300 idle: delete pm_idle Len Brown
2013-02-10 5:58 ` [PATCH 13/16] openrisc " Len Brown
2013-02-10 17:31 ` [ORLinux] " Jonas Bonn
2013-02-10 5:58 ` [PATCH 14/16] unicore32 idle: delete stray pm_idle comment Len Brown
2013-02-10 5:58 ` [PATCH 15/16] PM idle: remove global declaration of pm_idle Len Brown
2013-02-10 5:58 ` [PATCH 16/16] xen idle: make xen-specific macro xen-specific Len Brown
2013-02-11 9:18 ` [PATCH 01/16] APM idle: register apm_cpu_idle via cpuidle Daniel Lezcano
2013-02-11 22:50 ` Len Brown
2013-02-11 23:03 ` APM: Request to Test Len Brown
2013-02-11 23:03 ` [PATCH v2] APM idle: register apm_cpu_idle via cpuidle Len Brown
2013-02-12 15:00 ` Daniel Lezcano
2013-02-18 13:30 ` Jiri Kosina
2013-02-20 17:48 ` Len Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3a242f58a5f40c60568cb1e3b13f119432203f48.1360475150.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=sparclinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).