From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 5 Dec 2006 04:54:14 +0000 (+1100)
Subject: [POWERPC] Fix cell pmu initialisation
X-Git-Tag: v2.6.20-rc1~146^2~14^2~31
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a081e126e12f78651499ba0f9944a7df1e9b06b6;p=linux-2.6-omap-h63xx.git

[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>
---

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));