[POWERPC] fix cell pmu initialisation

Stephen Rothwell sfr at canb.auug.org.au
Tue Dec 5 15:54:14 EST 2006


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 at canb.auug.org.au>
---
 arch/powerpc/platforms/cell/pmu.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

After this patch, a combined kernel (including all the 64 bit platforms)
will boot on my Series P 285 (apart from a ata panic which may be
unrelated).

This should be safe for 2.6.20 (I think).
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --git a/arch/powerpc/platforms/cell/pmu.c b/arch/powerpc/platforms/cell/pmu.c
index 99c6120..d04ae16 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));
-- 
1.4.4.1




More information about the Linuxppc-dev mailing list