From 040f1e2011817dd7ffe0b3b9dd494de3001e7854 Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Sat, 15 May 2010 09:57:06 +0100 Subject: [PATCH] --- yaml --- r: 191751 b: refs/heads/master c: 8c0b742ca7a7d21de0ddc87eda6ef0b282e4de18 h: refs/heads/master i: 191749: c4c51e7ad4c33d485906cc3b49ae52b17e0f7bd3 191747: 80a07bccb3fecf661a19e1be05c3e433b3261966 191743: 9900681ac1ec3defe10e3c944e7de7c9608b10b3 v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/fault.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c766792ff2a0..af91d6cb88a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49aea0fd95495538230e19f58e217fb06ffdbfeb +refs/heads/master: 8c0b742ca7a7d21de0ddc87eda6ef0b282e4de18 diff --git a/trunk/arch/arm/mm/fault.c b/trunk/arch/arm/mm/fault.c index 9d40c341e07e..92f5801f99c1 100644 --- a/trunk/arch/arm/mm/fault.c +++ b/trunk/arch/arm/mm/fault.c @@ -463,7 +463,12 @@ static struct fsr_info { { do_bad, SIGILL, BUS_ADRALN, "alignment exception" }, { do_bad, SIGKILL, 0, "terminal exception" }, { do_bad, SIGILL, BUS_ADRALN, "alignment exception" }, +/* Do we need runtime check ? */ +#if __LINUX_ARM_ARCH__ < 6 { do_bad, SIGBUS, 0, "external abort on linefetch" }, +#else + { do_translation_fault, SIGSEGV, SEGV_MAPERR, "I-cache maintenance fault" }, +#endif { do_translation_fault, SIGSEGV, SEGV_MAPERR, "section translation fault" }, { do_bad, SIGBUS, 0, "external abort on linefetch" }, { do_page_fault, SIGSEGV, SEGV_MAPERR, "page translation fault" },