linux-mips
[Top] [All Lists]

[PATCH 4/5] MIPS: Use board_cache_error_setup for r4k cache error handle

To: linux-mips@linux-mips.org, ralf@linux-mips.org
Subject: [PATCH 4/5] MIPS: Use board_cache_error_setup for r4k cache error handler setup.
From: David Daney <ddaney.cavm@gmail.com>
Date: Mon, 19 Dec 2011 15:16:41 -0800
Cc: David Daney <david.daney@cavium.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=ZrI+KC2Orbodh45amE49n7ycpbIYL/io/tp2Xz3A2V0=; b=AkatDZgDOYeNdwhOrN6ZY3lZ7g/C+YxeFwPtuZt+ppoBMnSi/tGjfzlidgzoENd1qJ WS8z7OqHYdqKx3cplUebdDcximXfaziGWd8eop6qBdoBPE3d4DG+CAYWwmELaV+mUUbI OkHcIKpn/XT4mtWC0iVq2ZB2+Dk4G1cpNBBJk=
In-reply-to: <1324336602-29812-1-git-send-email-ddaney.cavm@gmail.com>
References: <1324336602-29812-1-git-send-email-ddaney.cavm@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
From: David Daney <david.daney@cavium.com>

Signed-off-by: David Daney <david.daney@cavium.com>
---
 arch/mips/mm/c-r4k.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index a79fe9a..036c004 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -33,7 +33,7 @@
 #include <asm/mmu_context.h>
 #include <asm/war.h>
 #include <asm/cacheflush.h> /* for run_uncached() */
-
+#include <asm/traps.h>
 
 /*
  * Special Variant of smp_call_function for use by cache functions:
@@ -1383,10 +1383,8 @@ static int __init setcoherentio(char *str)
 __setup("coherentio", setcoherentio);
 #endif
 
-void __cpuinit r4k_cache_init(void)
+static void __cpuinit r4k_cache_error_setup(void)
 {
-       extern void build_clear_page(void);
-       extern void build_copy_page(void);
        extern char __weak except_vec2_generic;
        extern char __weak except_vec2_sb1;
        struct cpuinfo_mips *c = &current_cpu_data;
@@ -1401,6 +1399,13 @@ void __cpuinit r4k_cache_init(void)
                set_uncached_handler(0x100, &except_vec2_generic, 0x80);
                break;
        }
+}
+
+void __cpuinit r4k_cache_init(void)
+{
+       extern void build_clear_page(void);
+       extern void build_copy_page(void);
+       struct cpuinfo_mips *c = &current_cpu_data;
 
        probe_pcache();
        setup_scache();
@@ -1463,4 +1468,5 @@ void __cpuinit r4k_cache_init(void)
        local_r4k___flush_cache_all(NULL);
 #endif
        coherency_setup();
+       board_cache_error_setup = r4k_cache_error_setup;
 }
-- 
1.7.2.3


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