sh: Disable L2 reporting for present URAM only parts.

The probing logic works for both URAM and L2, with no way to
distinguish between the two. Disable the probing for now and
let the CPU subtypes that have this in a real L2 configuration
explicitly say so.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 2 insertions, 5 deletions

diff --git a/arch/sh/kernel/cpu/sh4/probe.c b/arch/sh/kernel/cpu/sh4/probe.c
index 98d28fb1ce16..8f318a4fe722 100644
--- a/arch/sh/kernel/cpu/sh4/probe.c
+++ b/arch/sh/kernel/cpu/sh4/probe.c
@@ -3,7 +3,7 @@
  *
  * CPU Subtype Probing for SH-4.
  *
- * Copyright (C) 2001 - 2006  Paul Mundt
+ * Copyright (C) 2001 - 2007  Paul Mundt
  * Copyright (C) 2003  Richard Curnow
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -52,12 +52,9 @@ int __init detect_cpu_and_cache_system(void)
         current_cpu_data.dcache.linesz          = L1_CACHE_BYTES;
 
         /*
-         * Setup some generic flags we can probe
-         * (L2 and DSP detection only work on SH-4A)
+         * Setup some generic flags we can probe on SH-4A parts
          */
         if (((pvr >> 16) & 0xff) == 0x10) {
-                if ((cvr & 0x02000000) == 0)
-                        current_cpu_data.flags |= CPU_HAS_L2_CACHE;
                 if ((cvr & 0x10000000) == 0)
                         current_cpu_data.flags |= CPU_HAS_DSP;