[PATCH] m68k: fix __page_to_pfn for a const struct page argument

[PATCH] m68k: fix __page_to_pfn for a const struct page argument

[Ian Campbell]

Fixes fallout due to the removal of the cast in
mm-fix-__page_to_pfn-for-a-const-struct-page-argument.patch

(akpm: this should probably be folded into that patch. I glanced over the other
       architectures which appear not to use include/asm-generic/memory_model.h
       and they appear to follow the other pattern (using ptr arithmetic) and
       hence I think aren't susceptible to this issue).

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-m68k@lists.linux-m68k.org
---
 arch/m68k/include/asm/page_mm.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h
index 31d5570..89f2014 100644
--- a/arch/m68k/include/asm/page_mm.h
+++ b/arch/m68k/include/asm/page_mm.h
@@ -162,7 +162,7 @@ static inline __attribute_const__ int __virt_to_node_shift(void)
 	pgdat->node_mem_map + (__pfn - pgdat->node_start_pfn);		\
 })
 #define page_to_pfn(_page) ({						\
-	struct page *__p = (_page);					\
+	const struct page *__p = (_page);				\
 	struct pglist_data *pgdat;					\
 	pgdat = &pg_data_map[page_to_nid(__p)];				\
 	((__p) - pgdat->node_mem_map) + pgdat->node_start_pfn;		\
-- 
1.7.2.5

Re: [PATCH] m68k: fix __page_to_pfn for a const struct page argument

[Geert Uytterhoeven]

On Thu, Aug 18, 2011 at 10:37, Ian Campbell <ian.campbell@citrix.com> wrote:
> Fixes fallout due to the removal of the cast in
> mm-fix-__page_to_pfn-for-a-const-struct-page-argument.patch
>
> (akpm: this should probably be folded into that patch. I glanced over the other
>       architectures which appear not to use include/asm-generic/memory_model.h
>       and they appear to follow the other pattern (using ptr arithmetic) and
>       hence I think aren't susceptible to this issue).
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

The original patch claimed to fix the callers of __page_to_pfn(),
while it actually changed (and thus broke) the caller of page_to_pfn()...
Please put this on the fast track.

> Cc: linux-m68k@lists.linux-m68k.org
> ---
>  arch/m68k/include/asm/page_mm.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h
> index 31d5570..89f2014 100644
> --- a/arch/m68k/include/asm/page_mm.h
> +++ b/arch/m68k/include/asm/page_mm.h
> @@ -162,7 +162,7 @@ static inline __attribute_const__ int __virt_to_node_shift(void)
>        pgdat->node_mem_map + (__pfn - pgdat->node_start_pfn);          \
>  })
>  #define page_to_pfn(_page) ({                                          \
> -       struct page *__p = (_page);                                     \
> +       const struct page *__p = (_page);                               \
>        struct pglist_data *pgdat;                                      \
>        pgdat = &pg_data_map[page_to_nid(__p)];                         \
>        ((__p) - pgdat->node_mem_map) + pgdat->node_start_pfn;          \
> --
> 1.7.2.5

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