From 06a7a19f5c40e73504bfd40796ad71fc9366aa81 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Thu, 27 Sep 2007 10:29:58 +0900 Subject: [PATCH] --- yaml --- r: 68281 b: refs/heads/master c: 26fad19d8c3ca9abd7ffb85a63f8e25f1b4910dc h: refs/heads/master i: 68279: dab6ee849dbf5c689bccbdcdfd8ed01037224dce v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/cpu/sh4/probe.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bb10913dba34..1c4ed8f38899 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f91bbb58413e0bce9726cd6d12bf4b95c343a7f +refs/heads/master: 26fad19d8c3ca9abd7ffb85a63f8e25f1b4910dc diff --git a/trunk/arch/sh/kernel/cpu/sh4/probe.c b/trunk/arch/sh/kernel/cpu/sh4/probe.c index 98d28fb1ce16..8f318a4fe722 100644 --- a/trunk/arch/sh/kernel/cpu/sh4/probe.c +++ b/trunk/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;