From 1270c43436618be1aad950df72f10b73ac2a5b14 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Fri, 4 Dec 2009 16:22:11 +0900 Subject: [PATCH] --- yaml --- r: 173520 b: refs/heads/master c: 6e8a0d11a088ed51b1b649d3a1127a7bda3700a0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/cpu/init.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 1a725bb763e1..d3064db0d9db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a781d1e5ff6277f80ff3c9503775521bc64cf131 +refs/heads/master: 6e8a0d11a088ed51b1b649d3a1127a7bda3700a0 diff --git a/trunk/arch/sh/kernel/cpu/init.c b/trunk/arch/sh/kernel/cpu/init.c index ad9dfff9427c..89b4b76c0d76 100644 --- a/trunk/arch/sh/kernel/cpu/init.c +++ b/trunk/arch/sh/kernel/cpu/init.c @@ -75,16 +75,11 @@ static void __init expmask_init(void) /* * Future proofing. * - * Disable support for slottable sleep instruction - * and non-nop instructions in the rte delay slot. + * Disable support for slottable sleep instruction, non-nop + * instructions in the rte delay slot, and associative writes to + * the memory-mapped cache array. */ - expmask &= ~(EXPMASK_RTEDS | EXPMASK_BRDSSLP); - - /* - * Enable associative writes to the memory-mapped cache array - * until the cache flush ops have been rewritten. - */ - expmask |= EXPMASK_MMCAW; + expmask &= ~(EXPMASK_RTEDS | EXPMASK_BRDSSLP | EXPMASK_MMCAW); __raw_writel(expmask, EXPMASK); ctrl_barrier();