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

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 95d15eb5c03f708de52cac2fe06b1084ea093c26..a2bc433f36100f3d136447fb819263d510cdc0f2 100644 (file)
--- 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,
 {
        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/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index f736234db9b2a3f8fe65d708e99fde3b8e64d174..1b0c4c034a26a48230671ee40fbfe59066bb799f 100644 (file)
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -455,8 +455,6 @@ out:
 
 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.