Merge commit 'v2.6.39-rc4' into sched/core

Merge reason: Pick up upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index d2634e4476b4..edbddcbd5bc6 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -1404,8 +1404,6 @@ determine_cpu_caches (unsigned int cpu_type)
         case PCA56_CPU:
         case PCA57_CPU:
           {
-                unsigned long cbox_config, size;
-
                 if (cpu_type == PCA56_CPU) {
                         L1I = CSHAPE(16*1024, 6, 1);
                         L1D = CSHAPE(8*1024, 5, 1);
@@ -1415,10 +1413,12 @@ determine_cpu_caches (unsigned int cpu_type)
                 }
                 L3 = -1;
 
+#if 0
+                unsigned long cbox_config, size;
+
                 cbox_config = *(vulp) phys_to_virt (0xfffff00008UL);
                 size = 512*1024 * (1 << ((cbox_config >> 12) & 3));
 
-#if 0
                 L2 = ((cbox_config >> 31) & 1 ? CSHAPE (size, 6, 1) : -1);
 #else
                 L2 = external_cache_probe(512*1024, 6);