diff options
| author | Roel Kluin <roel.kluin@gmail.com> | 2009-03-31 15:23:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 08:59:15 -0700 |
| commit | 0b42afd0a3051952924ed373dcda61beb23fcb58 (patch) | |
| tree | e9973473c5ec0455047c91ed7591bf0b91ba862a | |
| parent | 9fab5619bdd7f84cdd22cc760778f759f9819a33 (diff) | |
| download | kernel_samsung_aries-0b42afd0a3051952924ed373dcda61beb23fcb58.zip kernel_samsung_aries-0b42afd0a3051952924ed373dcda61beb23fcb58.tar.gz kernel_samsung_aries-0b42afd0a3051952924ed373dcda61beb23fcb58.tar.bz2 | |
alpha: fix macros
When this macros isn't called with 'fixup', e.g. with foo this will
incorectly expand to foo->foo.bits.errreg
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/alpha/include/asm/uaccess.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/alpha/include/asm/uaccess.h b/arch/alpha/include/asm/uaccess.h index 22de3b4..163f305 100644 --- a/arch/alpha/include/asm/uaccess.h +++ b/arch/alpha/include/asm/uaccess.h @@ -498,13 +498,13 @@ struct exception_table_entry }; /* Returns the new pc */ -#define fixup_exception(map_reg, fixup, pc) \ +#define fixup_exception(map_reg, _fixup, pc) \ ({ \ - if ((fixup)->fixup.bits.valreg != 31) \ - map_reg((fixup)->fixup.bits.valreg) = 0; \ - if ((fixup)->fixup.bits.errreg != 31) \ - map_reg((fixup)->fixup.bits.errreg) = -EFAULT; \ - (pc) + (fixup)->fixup.bits.nextinsn; \ + if ((_fixup)->fixup.bits.valreg != 31) \ + map_reg((_fixup)->fixup.bits.valreg) = 0; \ + if ((_fixup)->fixup.bits.errreg != 31) \ + map_reg((_fixup)->fixup.bits.errreg) = -EFAULT; \ + (pc) + (_fixup)->fixup.bits.nextinsn; \ }) |