---

yaml --- r: 24655 b: refs/heads/master c: 4d177fb h: refs/heads/master i: 24653: 72fe4b0 24651: fc237ed 24647: 7ff8b6a 24639: 73d51d3 v: v3
git-mirror · Mar 28, 2006 · 37041c0 · 37041c0
1 parent 8b872f6
commit 37041c0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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.