From 8ebc8d750bec8e7d25ab542eacc44c384079e5f4 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 18 Aug 2011 09:37:02 +0100 Subject: [PATCH] --- yaml --- r: 263206 b: refs/heads/master c: ba8f318471f66d5d5b79da68112525cf432b2b18 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/page_mm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 988f57638daa..79d6423532a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35a177a08d14f238d89d7f03918d3e0482af3240 +refs/heads/master: ba8f318471f66d5d5b79da68112525cf432b2b18 diff --git a/trunk/arch/m68k/include/asm/page_mm.h b/trunk/arch/m68k/include/asm/page_mm.h index 31d5570d6567..89f201434b5a 100644 --- a/trunk/arch/m68k/include/asm/page_mm.h +++ b/trunk/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; \