From 79cdbb63a7084305303519bcc43feff13c6d0656 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 17 Aug 2011 13:45:09 +0100
Subject: [PATCH] --- yaml --- r: 263070 b: refs/heads/master c:
 f991879473828f320a714e9494fb37a26ccd6b66 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/hash.h | 2 +-
 trunk/include/linux/mm.h   | 2 +-
 trunk/mm/highmem.c         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index bed2dde98c72..3f6cbb7fbc44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72ed62bdc46d76c965fb95aecb5d0bf97c976723
+refs/heads/master: f991879473828f320a714e9494fb37a26ccd6b66
diff --git a/trunk/include/linux/hash.h b/trunk/include/linux/hash.h
index 06d25c189cc5..b80506bdd733 100644
--- a/trunk/include/linux/hash.h
+++ b/trunk/include/linux/hash.h
@@ -63,7 +63,7 @@ static inline u32 hash_32(u32 val, unsigned int bits)
 	return hash >> (32 - bits);
 }
 
-static inline unsigned long hash_ptr(void *ptr, unsigned int bits)
+static inline unsigned long hash_ptr(const void *ptr, unsigned int bits)
 {
 	return hash_long((unsigned long)ptr, bits);
 }
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index fd599f4bb846..c06454d60a3d 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -737,7 +737,7 @@ static __always_inline void *lowmem_page_address(const struct page *page)
 #endif
 
 #if defined(HASHED_PAGE_VIRTUAL)
-void *page_address(struct page *page);
+void *page_address(const struct page *page);
 void set_page_address(struct page *page, void *virtual);
 void page_address_init(void);
 #endif
diff --git a/trunk/mm/highmem.c b/trunk/mm/highmem.c
index 693394daa2ed..5ef672c07f75 100644
--- a/trunk/mm/highmem.c
+++ b/trunk/mm/highmem.c
@@ -326,7 +326,7 @@ static struct page_address_slot {
 	spinlock_t lock;			/* Protect this bucket's list */
 } ____cacheline_aligned_in_smp page_address_htable[1<<PA_HASH_ORDER];
 
-static struct page_address_slot *page_slot(struct page *page)
+static struct page_address_slot *page_slot(const struct page *page)
 {
 	return &page_address_htable[hash_ptr(page, PA_HASH_ORDER)];
 }
@@ -337,7 +337,7 @@ static struct page_address_slot *page_slot(struct page *page)
  *
  * Returns the page's virtual address.
  */
-void *page_address(struct page *page)
+void *page_address(const struct page *page)
 {
 	unsigned long flags;
 	void *ret;