From: Lennert Buytenhek Date: Thu, 24 Apr 2008 05:31:46 +0000 (-0400) Subject: [ARM] feroceon: remove CONFIG_CPU_CACHE_ROUND_ROBIN check X-Git-Tag: v2.6.26-rc1~351^2~1^3~4 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c5a1e8f7091c33c7f6b53f070d13380facab6607;p=karo-tx-linux.git [ARM] feroceon: remove CONFIG_CPU_CACHE_ROUND_ROBIN check Since the Feroceon cache replacement policy is always pseudorandom (and the relevant control register bit is ignored), remove the CONFIG_CPU_CACHE_ROUND_ROBIN check from proc-feroceon.S. Signed-off-by: Lennert Buytenhek Signed-off-by: Nicolas Pitre --- diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S index e9ac984d2897..3ceb6785a345 100644 --- a/arch/arm/mm/proc-feroceon.S +++ b/arch/arm/mm/proc-feroceon.S @@ -358,9 +358,6 @@ __feroceon_setup: mrc p15, 0, r0, c1, c0 @ get control register v4 bic r0, r0, r5 orr r0, r0, r6 -#ifdef CONFIG_CPU_CACHE_ROUND_ROBIN - orr r0, r0, #0x4000 @ .1.. .... .... .... -#endif mov pc, lr .size __feroceon_setup, . - __feroceon_setup