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,
 {
         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 f736234db9b2..1b0c4c034a26 100644
--- 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.