Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Roel Kluin and committed by
Linus Torvalds
0b42afd0 9fab5619

+6 -6
+6 -6
arch/alpha/include/asm/uaccess.h
··· 498 498 }; 499 499 500 500 /* Returns the new pc */ 501 - #define fixup_exception(map_reg, fixup, pc) \ 501 + #define fixup_exception(map_reg, _fixup, pc) \ 502 502 ({ \ 503 - if ((fixup)->fixup.bits.valreg != 31) \ 504 - map_reg((fixup)->fixup.bits.valreg) = 0; \ 505 - if ((fixup)->fixup.bits.errreg != 31) \ 506 - map_reg((fixup)->fixup.bits.errreg) = -EFAULT; \ 507 - (pc) + (fixup)->fixup.bits.nextinsn; \ 503 + if ((_fixup)->fixup.bits.valreg != 31) \ 504 + map_reg((_fixup)->fixup.bits.valreg) = 0; \ 505 + if ((_fixup)->fixup.bits.errreg != 31) \ 506 + map_reg((_fixup)->fixup.bits.errreg) = -EFAULT; \ 507 + (pc) + (_fixup)->fixup.bits.nextinsn; \ 508 508 }) 509 509 510 510