[PATCH 1/2] h8300: Correct signature of test_bit()

[PATCH 1/2] h8300: Correct signature of test_bit()

[Geert Uytterhoeven]

mm/filemap.c: In function 'clear_bit_unlock_is_negative_byte':
mm/filemap.c:933:9: warning: passing argument 2 of 'test_bit' discards 'volatile' qualifier from pointer target type
  return test_bit(PG_waiters, mem);
         ^
In file included from include/linux/bitops.h:36:0,
                 from include/linux/kernel.h:10,
                 from include/linux/list.h:8,
                 from include/linux/wait.h:6,
                 from include/linux/fs.h:5,
                 from include/linux/dax.h:4,
                 from mm/filemap.c:14:
arch/h8300/include/asm/bitops.h:68:90: note: expected 'const long unsigned int *' but argument is of type 'volatile void *'
 static inline int test_bit(int nr, const unsigned long *addr)

Make the bitmask pointed to by the "addr" parameter volatile to fix
this, like is done on other architectures.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
Exposed by commit 98473f9f3f9bd404 ("mm/filemap: fix parameters to
test_bit()").
---
 arch/h8300/include/asm/bitops.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/h8300/include/asm/bitops.h b/arch/h8300/include/asm/bitops.h
index 05999aba1d6ab364..30eaf5b9bf7319ad 100644
--- a/arch/h8300/include/asm/bitops.h
+++ b/arch/h8300/include/asm/bitops.h
@@ -65,7 +65,7 @@ static inline void FNAME(int nr, volatile unsigned long *addr)	\
 
 #undef H8300_GEN_BITOP
 
-static inline int test_bit(int nr, const unsigned long *addr)
+static inline int test_bit(int nr, const volatile unsigned long *addr)
 {
 	int ret = 0;
 	unsigned char *b_addr;
-- 
1.9.1

[PATCH 2/2] m68k/bitops: Correct signature of test_bit()

[Geert Uytterhoeven]

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 <geert@linux-m68k.org>
---
Exposed by commit 98473f9f3f9bd404 ("mm/filemap: fix parameters to
test_bit()").
---
 arch/m68k/include/asm/bitops.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h
index b4a9b0d5928dfb33..dda58cfe8c22a3ec 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;
 }
-- 
1.9.1

[PATCH 2/2] m68k/bitops: Correct signature of test_bit()

[Geert Uytterhoeven]

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 <geert@linux-m68k.org>
---
Exposed by commit 98473f9f3f9bd404 ("mm/filemap: fix parameters to
test_bit()").
---
 arch/m68k/include/asm/bitops.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/m68k/include/asm/bitops.h b/arch/m68k/include/asm/bitops.h
index b4a9b0d5928dfb33..dda58cfe8c22a3ec 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;
 }
-- 
1.9.1

Re: [PATCH 2/2] m68k/bitops: Correct signature of test_bit()

[Geert Uytterhoeven]

On Tue, Jan 3, 2017 at 6:52 PM, Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> 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 <geert@linux-m68k.org>

Applied, and queued for the second batch for 4.11.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 2/2] m68k/bitops: Correct signature of test_bit()

[Geert Uytterhoeven]

On Tue, Jan 3, 2017 at 6:52 PM, Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> 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 <geert@linux-m68k.org>

Applied, and queued for the second batch for 4.11.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

[PATCH 1/2] h8300: Correct signature of test_bit()

[Geert Uytterhoeven]

mm/filemap.c: In function 'clear_bit_unlock_is_negative_byte':
mm/filemap.c:933:9: warning: passing argument 2 of 'test_bit' discards 'volatile' qualifier from pointer target type
  return test_bit(PG_waiters, mem);
         ^
In file included from include/linux/bitops.h:36:0,
                 from include/linux/kernel.h:10,
                 from include/linux/list.h:8,
                 from include/linux/wait.h:6,
                 from include/linux/fs.h:5,
                 from include/linux/dax.h:4,
                 from mm/filemap.c:14:
arch/h8300/include/asm/bitops.h:68:90: note: expected 'const long unsigned int *' but argument is of type 'volatile void *'
 static inline int test_bit(int nr, const unsigned long *addr)

Make the bitmask pointed to by the "addr" parameter volatile to fix
this, like is done on other architectures.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
Exposed by commit 98473f9f3f9bd404 ("mm/filemap: fix parameters to
test_bit()").
---
 arch/h8300/include/asm/bitops.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/h8300/include/asm/bitops.h b/arch/h8300/include/asm/bitops.h
index 05999aba1d6ab364..30eaf5b9bf7319ad 100644
--- a/arch/h8300/include/asm/bitops.h
+++ b/arch/h8300/include/asm/bitops.h
@@ -65,7 +65,7 @@ static inline void FNAME(int nr, volatile unsigned long *addr)	\
 
 #undef H8300_GEN_BITOP
 
-static inline int test_bit(int nr, const unsigned long *addr)
+static inline int test_bit(int nr, const volatile unsigned long *addr)
 {
 	int ret = 0;
 	unsigned char *b_addr;
-- 
1.9.1