aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2006-03-28 01:14:44 -0500
committerPaul Mackerras <paulus@samba.org>2006-03-28 04:40:33 -0500
commit4d177fbfdadb011f1bac96f9ccba0cc9f21da8de (patch)
treeebd6442522d817a266f22262022d11155717f743
parentcf66c897d7fa07f57452b1a369aec37d97b11e31 (diff)
[PATCH] powerpc: a couple of trivial compile warning fixes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/kernel/prom.c5
-rw-r--r--arch/powerpc/platforms/pseries/setup.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 95d15eb5c03f..a2bc433f3610 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -860,7 +860,10 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
860{ 860{
861 static int logical_cpuid = 0; 861 static int logical_cpuid = 0;
862 char *type = of_get_flat_dt_prop(node, "device_type", NULL); 862 char *type = of_get_flat_dt_prop(node, "device_type", NULL);
863 u32 *prop, *intserv; 863#ifdef CONFIG_ALTIVEC
864 u32 *prop;
865#endif
866 u32 *intserv;
864 int i, nthreads; 867 int i, nthreads;
865 unsigned long len; 868 unsigned long len;
866 int found = 0; 869 int found = 0;
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index f736234db9b2..1b0c4c034a26 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -455,8 +455,6 @@ out:
455 455
456static void pseries_shared_idle_sleep(void) 456static void pseries_shared_idle_sleep(void)
457{ 457{
458 unsigned int cpu = smp_processor_id();
459
460 /* 458 /*
461 * Indicate to the HV that we are idle. Now would be 459 * Indicate to the HV that we are idle. Now would be
462 * a good time to find other work to dispatch. 460 * a good time to find other work to dispatch.