| To: | linux-mips@linux-mips.org, ralf@linux-mips.org |
|---|---|
| Subject: | [PATCH v2 4/5] MIPS: Use board_cache_error_setup for r4k cache error handler setup. |
| From: | David Daney <ddaney.cavm@gmail.com> |
| Date: | Mon, 14 May 2012 17:04:49 -0700 |
| Cc: | David Daney <david.daney@cavium.com> |
| Dkim-signature: | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=yQRzfAtsL+nOZj2k3RrxeM8MN3oiRWqCAwE+0OxHxM8=; b=I8S1kv/XOLiDoKNfzm1orlSsnNsjzXBxD5/Dp1eqgNpxS2Q9MGosZQizjGCwOYiivf iOVBm6c3Y/sOZgM3OMh0dBobF+br9g0lIUFt5Qk1lhaH/cvYePU2+sYyFMRTo+FEeiqU SzmrO6THATS3O1WbC1e/oGb/Jv3NcHS2IlUgYV1zaPpdqBh+M4GVKZxmFi4Y8l6QUinC M7sNN6obVtPPT0FUBI/XQGRjBIgBD1qJLZilwWGUzrPjhalse1dOOsS+6VO543XdGtdB WduR+I+UBUTfi/sd+7UlgwFHK7YveNpOWwDww4OTvbBjKIdDqSxeQCOm4yiSBXzJQhsF pUWA== |
| In-reply-to: | <1337040290-16015-1-git-send-email-ddaney.cavm@gmail.com> |
| References: | <1337040290-16015-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 bda8eb2..5109be9 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -32,7 +32,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:
@@ -1385,10 +1385,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 = ¤t_cpu_data;
@@ -1403,6 +1401,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 = ¤t_cpu_data;
probe_pcache();
setup_scache();
@@ -1465,4 +1470,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> |
|---|---|---|
| ||
| Previous by Date: | [PATCH v2 3/5] MIPS: Octeon: Use board_cache_error_setup for cache error handler setup., David Daney |
|---|---|
| Next by Date: | [PATCH v2 5/5] MIPS: Move cache setup to setup_arch()., David Daney |
| Previous by Thread: | [PATCH v2 3/5] MIPS: Octeon: Use board_cache_error_setup for cache error handler setup., David Daney |
| Next by Thread: | [PATCH v2 5/5] MIPS: Move cache setup to setup_arch()., David Daney |
| Indexes: | [Date] [Thread] [Top] [All Lists] |