diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-17 16:42:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-17 16:42:50 -0700 |
| commit | ad32fd7426e192cdf5368eda23a6482ff83c2022 (patch) | |
| tree | 9e012b11fb30e3b99df271bdf2b63b863b778112 /arch/xtensa/include/asm/bitops.h | |
| parent | 6e8ba0098e241a5425f7aa6d950a5a00c44c9781 (diff) | |
| parent | 775fd6bfefc66a8c33e91dd9687ed530643b954d (diff) | |
Merge tag 'xtensa-20191017' of git://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa fixes from Max Filippov:
- fix {get,put}_user() for 64bit values
- fix warning about static EXPORT_SYMBOL from modpost
- fix PCI IO ports mapping for the virt board
- fix pasto in change_bit for exclusive access option
* tag 'xtensa-20191017' of git://github.com/jcmvbkbc/linux-xtensa:
xtensa: fix change_bit in exclusive access option
xtensa: virt: fix PCI IO ports mapping
xtensa: drop EXPORT_SYMBOL for outs*/ins*
xtensa: fix type conversion in __get_user_[no]check
xtensa: clean up assembly arguments in uaccess macros
xtensa: fix {get,put}_user() for 64bit values
Diffstat (limited to 'arch/xtensa/include/asm/bitops.h')
| -rw-r--r-- | arch/xtensa/include/asm/bitops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/bitops.h b/arch/xtensa/include/asm/bitops.h index aeb15f4c755b..be8b2be5a98b 100644 --- a/arch/xtensa/include/asm/bitops.h +++ b/arch/xtensa/include/asm/bitops.h @@ -148,7 +148,7 @@ static inline void change_bit(unsigned int bit, volatile unsigned long *p) " getex %0\n" " beqz %0, 1b\n" : "=&a" (tmp) - : "a" (~mask), "a" (p) + : "a" (mask), "a" (p) : "memory"); } |