[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1309643272-364-8-git-send-email-ext-phil.2.carmody@nokia.com>
Date: Sun, 3 Jul 2011 00:47:52 +0300
From: Phil Carmody <ext-phil.2.carmody@...ia.com>
To: trivial@...nel.org
Cc: ext-phil.2.carmody@...ia.com, linux-kernel@...r.kernel.org
Subject: [PATCH 7/7] xtensa: there is no CONFIG_UNALIGNED_USER
There is, however, CONFIG_XTENSE_UNALIGNED_USER.
Part of a shotgun patchset; found by greps, seds, and diffs
rather than actual understanding.
Signed-off-by: Phil Carmody <ext-phil.2.carmody@...ia.com>
---
arch/xtensa/kernel/traps.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index e64efac..993c0dd 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -97,7 +97,7 @@ static dispatch_init_table_t __initdata dispatch_init_table[] = {
/* EXCCAUSE_INTEGER_DIVIDE_BY_ZERO unhandled */
/* EXCCAUSE_PRIVILEGED unhandled */
#if XCHAL_UNALIGNED_LOAD_EXCEPTION || XCHAL_UNALIGNED_STORE_EXCEPTION
-#ifdef CONFIG_UNALIGNED_USER
+#ifdef CONFIG_XTENSA_UNALIGNED_USER
{ EXCCAUSE_UNALIGNED, USER, fast_unaligned },
#else
{ EXCCAUSE_UNALIGNED, 0, do_unaligned_user },
@@ -239,12 +239,12 @@ do_illegal_instruction(struct pt_regs *regs)
/*
* Handle unaligned memory accesses from user space. Kill task.
*
- * If CONFIG_UNALIGNED_USER is not set, we don't allow unaligned memory
+ * If CONFIG_XTENSA_UNALIGNED_USER is not set, we don't allow unaligned memory
* accesses causes from user space.
*/
#if XCHAL_UNALIGNED_LOAD_EXCEPTION || XCHAL_UNALIGNED_STORE_EXCEPTION
-#ifndef CONFIG_UNALIGNED_USER
+#ifndef CONFIG_XTENSA_UNALIGNED_USER
void
do_unaligned_user (struct pt_regs *regs)
{
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists