From b0823e7391bd40300f3dfc7867ed33e9f74aebab Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 17 Aug 2011 17:40:33 +0100
Subject: [PATCH] --- yaml --- r: 263071 b: refs/heads/master c:
 aa462abe8aaf2198d6aef97da20c874ac694a39f h: refs/heads/master i:   263069:
 e77df9bfb172ee57b446f700c3c7b5981ed70337   263067:
 37c583ff7cee3ca01a16e7d23a27209299de11de   263063:
 f68106fd20841b3d5026ba825c154051fd1b6225   263055:
 1814bc3288cea063eda9fbdc2cca7f5221a0e18c   263039:
 21e9f9542619fb723e94f592d25d0cb56d1a0392 v: v3

---
 [refs]                                   | 2 +-
 trunk/include/asm-generic/memory_model.h | 4 ++--
 trunk/include/linux/mm.h                 | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3f6cbb7fbc44..9def27361b7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f991879473828f320a714e9494fb37a26ccd6b66
+refs/heads/master: aa462abe8aaf2198d6aef97da20c874ac694a39f
diff --git a/trunk/include/asm-generic/memory_model.h b/trunk/include/asm-generic/memory_model.h
index fb2d63f13f4c..aea9e45efce6 100644
--- a/trunk/include/asm-generic/memory_model.h
+++ b/trunk/include/asm-generic/memory_model.h
@@ -39,7 +39,7 @@
 })
 
 #define __page_to_pfn(pg)						\
-({	struct page *__pg = (pg);					\
+({	const struct page *__pg = (pg);					\
 	struct pglist_data *__pgdat = NODE_DATA(page_to_nid(__pg));	\
 	(unsigned long)(__pg - __pgdat->node_mem_map) +			\
 	 __pgdat->node_start_pfn;					\
@@ -57,7 +57,7 @@
  * section[i].section_mem_map == mem_map's address - start_pfn;
  */
 #define __page_to_pfn(pg)					\
-({	struct page *__pg = (pg);				\
+({	const struct page *__pg = (pg);				\
 	int __sec = page_to_section(__pg);			\
 	(unsigned long)(__pg - __section_mem_map_addr(__nr_to_section(__sec)));	\
 })
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index c06454d60a3d..7438071b44aa 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -685,7 +685,7 @@ static inline void set_page_section(struct page *page, unsigned long section)
 	page->flags |= (section & SECTIONS_MASK) << SECTIONS_PGSHIFT;
 }
 
-static inline unsigned long page_to_section(struct page *page)
+static inline unsigned long page_to_section(const struct page *page)
 {
 	return (page->flags >> SECTIONS_PGSHIFT) & SECTIONS_MASK;
 }
@@ -720,7 +720,7 @@ static inline void set_page_links(struct page *page, enum zone_type zone,
 
 static __always_inline void *lowmem_page_address(const struct page *page)
 {
-	return __va(PFN_PHYS(page_to_pfn((struct page *)page)));
+	return __va(PFN_PHYS(page_to_pfn(page)));
 }
 
 #if defined(CONFIG_HIGHMEM) && !defined(WANT_PAGE_VIRTUAL)