From: Max Filippov Date: Mon, 15 Oct 2012 17:23:02 +0000 (+0400) Subject: xtensa: fix unaligned usermode access X-Git-Tag: v3.7-rc2~12^2~4 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4ded6282caa0b6d0cfa79124610aae1194aa649b;p=~emulex%2Finfiniband.git xtensa: fix unaligned usermode access - correct use of .config #define name; CONFIG_UNALIGNED_USER ---> CONFIG_XTENSA_UNALIGNED_USER Signed-off-by: Max Filippov Signed-off-by: Pete Delaney Signed-off-by: Chris Zankel --- diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c index 92ba9f83eaa..5caf2b64d43 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 }, @@ -244,7 +244,7 @@ do_illegal_instruction(struct pt_regs *regs) */ #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) {