From 37041c06e7839ff7d0773821a3ee2d554068b098 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 28 Mar 2006 17:14:44 +1100
Subject: [PATCH] --- yaml --- r: 24655 b: refs/heads/master c:
 4d177fbfdadb011f1bac96f9ccba0cc9f21da8de h: refs/heads/master i:   24653:
 72fe4b0e06ecdcd58317cb0e17548b9c9bee2859   24651:
 fc237ed46262440b9c165d9baeb168903a5da8a1   24647:
 7ff8b6a93c7a5d12156bffcc688420f42554a2f5   24639:
 73d51d3b84484307c554a91f6e1d3eded897dc09 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/powerpc/kernel/prom.c             | 5 ++++-
 trunk/arch/powerpc/platforms/pseries/setup.c | 2 --
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 06f182bc2629..490f4a7247fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf66c897d7fa07f57452b1a369aec37d97b11e31
+refs/heads/master: 4d177fbfdadb011f1bac96f9ccba0cc9f21da8de
diff --git a/trunk/arch/powerpc/kernel/prom.c b/trunk/arch/powerpc/kernel/prom.c
index 95d15eb5c03f..a2bc433f3610 100644
--- a/trunk/arch/powerpc/kernel/prom.c
+++ b/trunk/arch/powerpc/kernel/prom.c
@@ -860,7 +860,10 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
 {
 	static int logical_cpuid = 0;
 	char *type = of_get_flat_dt_prop(node, "device_type", NULL);
-	u32 *prop, *intserv;
+#ifdef CONFIG_ALTIVEC
+	u32 *prop;
+#endif
+	u32 *intserv;
 	int i, nthreads;
 	unsigned long len;
 	int found = 0;
diff --git a/trunk/arch/powerpc/platforms/pseries/setup.c b/trunk/arch/powerpc/platforms/pseries/setup.c
index f736234db9b2..1b0c4c034a26 100644
--- a/trunk/arch/powerpc/platforms/pseries/setup.c
+++ b/trunk/arch/powerpc/platforms/pseries/setup.c
@@ -455,8 +455,6 @@ static void pseries_dedicated_idle_sleep(void)
 
 static void pseries_shared_idle_sleep(void)
 {
-	unsigned int cpu = smp_processor_id();
-
 	/*
 	 * Indicate to the HV that we are idle. Now would be
 	 * a good time to find other work to dispatch.