Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic uaccess.h cleanup from Arnd Bergmann: "Like in 3.19, I once more have a multi-stage cleanup for one asm-generic header file, this time the work was done by Michael Tsirkin and cleans up the uaccess.h file in asm-generic, as well as all architectures for which the respective maintainers did not pick up his patches directly" * tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: (37 commits) sparc32: nocheck uaccess coding style tweaks sparc64: nocheck uaccess coding style tweaks xtensa: macro whitespace fixes sh: macro whitespace fixes parisc: macro whitespace fixes m68k: macro whitespace fixes m32r: macro whitespace fixes frv: macro whitespace fixes cris: macro whitespace fixes avr32: macro whitespace fixes arm64: macro whitespace fixes arm: macro whitespace fixes alpha: macro whitespace fixes blackfin: macro whitespace fixes sparc64: uaccess_64 macro whitespace fixes sparc32: uaccess_32 macro whitespace fixes avr32: whitespace fix sh: fix put_user sparse errors metag: fix put_user sparse errors ia64: fix put_user sparse errors ...
Esse commit está contido em:
@@ -169,10 +169,11 @@ do { \
|
||||
(err) = ia64_getreg(_IA64_REG_R8); \
|
||||
(val) = ia64_getreg(_IA64_REG_R9); \
|
||||
} while (0)
|
||||
# define __put_user_size(val, addr, n, err) \
|
||||
do { \
|
||||
__st_user("__ex_table", (unsigned long) addr, n, RELOC_TYPE, (unsigned long) (val)); \
|
||||
(err) = ia64_getreg(_IA64_REG_R8); \
|
||||
# define __put_user_size(val, addr, n, err) \
|
||||
do { \
|
||||
__st_user("__ex_table", (unsigned long) addr, n, RELOC_TYPE, \
|
||||
(__force unsigned long) (val)); \
|
||||
(err) = ia64_getreg(_IA64_REG_R8); \
|
||||
} while (0)
|
||||
#endif /* !ASM_SUPPORTED */
|
||||
|
||||
@@ -197,7 +198,7 @@ extern void __get_user_unknown (void);
|
||||
case 8: __get_user_size(__gu_val, __gu_ptr, 8, __gu_err); break; \
|
||||
default: __get_user_unknown(); break; \
|
||||
} \
|
||||
(x) = (__typeof__(*(__gu_ptr))) __gu_val; \
|
||||
(x) = (__force __typeof__(*(__gu_ptr))) __gu_val; \
|
||||
__gu_err; \
|
||||
})
|
||||
|
||||
|
Referência em uma nova issue
Block a user