summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2006-12-05 15:54:14 +1100
committerPaul Mackerras <paulus@samba.org>2006-12-08 15:55:54 +1100
commita081e126e12f78651499ba0f9944a7df1e9b06b6 (patch)
treecdc10394758304462953a3e546d80fbef6a033d2 /arch
parentc99767974ebd2a719d849fdeaaa1674456f5283f (diff)
downloadlinux-3.10-a081e126e12f78651499ba0f9944a7df1e9b06b6.tar.gz
linux-3.10-a081e126e12f78651499ba0f9944a7df1e9b06b6.tar.bz2
linux-3.10-a081e126e12f78651499ba0f9944a7df1e9b06b6.zip
[POWERPC] Fix cell pmu initialisation
Make sure that the pmu is not initialised unless we are running on a cell. Also make the init routine static. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/cell/pmu.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/cell/pmu.c b/arch/powerpc/platforms/cell/pmu.c
index 99c612025e8..d04ae1671e6 100644
--- a/arch/powerpc/platforms/cell/pmu.c
+++ b/arch/powerpc/platforms/cell/pmu.c
@@ -382,11 +382,14 @@ static irqreturn_t cbe_pm_irq(int irq, void *dev_id)
return IRQ_HANDLED;
}
-int __init cbe_init_pm_irq(void)
+static int __init cbe_init_pm_irq(void)
{
unsigned int irq;
int rc, node;
+ if (!machine_is(cell))
+ return 0;
+
for_each_node(node) {
irq = irq_create_mapping(NULL, IIC_IRQ_IOEX_PMI |
(node << IIC_IRQ_NODE_SHIFT));