From: Geert Uytterhoeven Date: Mon, 2 Jan 2017 12:51:43 +0000 (+0100) Subject: m68k/bitops: Correct signature of test_bit() X-Git-Tag: microblaze-4.13-rc1~408^2~2 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=066def56dc712329561abadcea15be9cad7393b6;p=linux-2.6-microblaze.git m68k/bitops: Correct signature of test_bit() mm/filemap.c: In function ‘clear_bit_unlock_is_negative_byte’: mm/filemap.c:933: warning: passing argument 2 of ‘test_bit’ discards qualifiers from pointer target type Make the bitmask pointed to by the "vaddr" parameter volatile to fix this, like is done on other architectures. Signed-off-by: Geert Uytterhoeven --- diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h index b4a9b0d5928d..dda58cfe8c22 100644 --- a/arch/m68k/include/asm/bitops.h +++ b/arch/m68k/include/asm/bitops.h @@ -148,7 +148,7 @@ static inline void bfchg_mem_change_bit(int nr, volatile unsigned long *vaddr) #define __change_bit(nr, vaddr) change_bit(nr, vaddr) -static inline int test_bit(int nr, const unsigned long *vaddr) +static inline int test_bit(int nr, const volatile unsigned long *vaddr) { return (vaddr[nr >> 5] & (1UL << (nr & 31))) != 0; }