linux-mips
[Top] [All Lists]

Re: [PATCH 4/4] MIPS: Remove kernel_uses_smartmips_rixi macro definition

To: "Steven J. Hill" <sjhill@mips.com>, ralf@linux-mips.org
Subject: Re: [PATCH 4/4] MIPS: Remove kernel_uses_smartmips_rixi macro definition.
From: David Daney <ddaney.cavm@gmail.com>
Date: Wed, 05 Sep 2012 14:22:06 -0700
Cc: linux-mips@linux-mips.org
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=W2rVSZPlvP+2xOBQJm83D3E0BWQpoZ4cGB3zci18QaA=; b=JHB6aZNsiP5004ojuLLB7oYY1plwuiOgLZC/Y2e59AWMuaINxv1hljW1MVQupz5pY7 NB4irb1g+t0XT7QKw0WWuSi9xX1L8pXjx3hsPpnAYksgSI7MTkuEOYTWJifjQGIUS46+ sKk7NX32JKTli0Mnkg8vlNaIq8zzCPKF4EPr21eZ5d9qquhdTvAJN6mdVDoI/Gq1sI3U iz8P167jaR6JdD2cFFjqFdDJjOd+U+C6PxBE4ObLnntL3BUGA3GX/N9XRhhReTYDpNB9 q8jpE5SK4JKy2H6NSBEIpVD46paqCTTSHOPlX1DTDsHsVE7bXFxF/GEWmZWFmb2fzF0x nAmA==
In-reply-to: <1346876878-25965-5-git-send-email-sjhill@mips.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
References: <1346876878-25965-1-git-send-email-sjhill@mips.com> <1346876878-25965-5-git-send-email-sjhill@mips.com>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120828 Thunderbird/15.0
On 09/05/2012 01:27 PM, Steven J. Hill wrote:
From: "Steven J. Hill" <sjhill@mips.com>

Remove the 'kernel_uses_smartmips_rixi' macro definitions from
the architecture header files.

Signed-off-by: Steven J. Hill <sjhill@mips.com>
---
  arch/mips/include/asm/cpu-features.h               |    3 ---
  .../asm/mach-cavium-octeon/cpu-feature-overrides.h |    2 --
  2 files changed, 5 deletions(-)

diff --git a/arch/mips/include/asm/cpu-features.h 
b/arch/mips/include/asm/cpu-features.h
index c78a77b..7452d78 100644
--- a/arch/mips/include/asm/cpu-features.h
+++ b/arch/mips/include/asm/cpu-features.h
@@ -95,9 +95,6 @@
  #ifndef cpu_has_smartmips
  #define cpu_has_smartmips      (cpu_data[0].ases & MIPS_ASE_SMARTMIPS)
  #endif
-#ifndef kernel_uses_smartmips_rixi
-#define kernel_uses_smartmips_rixi 0

As I said in the other message, you will want to have the replacement for this instance of kernel_uses_smartmips_rixi in place before you do the other conversions.

That said, at the end of the patch set, this does need to go, so something like this will be needed.

David Daney

-#endif
  #ifndef cpu_has_ri
  #define cpu_has_ri            (cpu_data[0].options & MIPS_CPU_RI)
  #endif
diff --git a/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h 
b/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
index a58addb..971bdc2 100644
--- a/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
@@ -58,8 +58,6 @@
  #define cpu_has_veic          0
  #define cpu_hwrena_impl_bits  0xc0000000

-#define kernel_uses_smartmips_rixi (cpu_data[0].cputype != CPU_CAVIUM_OCTEON)
-
  #define ARCH_HAS_IRQ_PER_CPU  1
  #define ARCH_HAS_SPINLOCK_PREFETCH 1
  #define spin_lock_prefetch(x) prefetch(x)



<Prev in Thread] Current Thread [Next in Thread>