From 651e797ef34dd71853a81c7cfaa39610f34f3d47 Mon Sep 17 00:00:00 2001
From: Kevin Cernekee <cernekee@gmail.com>
Date: Sun, 5 Jul 2009 12:08:19 -0700
Subject: [PATCH] --- yaml --- r: 154911 b: refs/heads/master c:
 5bfd7560979062ad75c9805c1719cec990b5db29 h: refs/heads/master i:   154909:
 7ea22cab31364285172cd61997faa6de3959dfd9   154907:
 ea403aafc23c791fe37b9275dcdabfc7ab5e164c   154903:
 de8b08e72e2c5c8122b84ff5e6b88d59eece9314   154895:
 3aa02e9388821e149b36e3879797d44ae34af3ba   154879:
 2fa3b1bf0c20a5307bc991074d2048cd828c0a18 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/usb/mon/mon_bin.c | 2 +-
 trunk/kernel/perf_counter.c     | 2 +-
 trunk/mm/page_alloc.c           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ef191ed50a23..b2bb011a9421 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8236db9cd7aa492dcfcdcca702638e704abed49
+refs/heads/master: 5bfd7560979062ad75c9805c1719cec990b5db29
diff --git a/trunk/drivers/usb/mon/mon_bin.c b/trunk/drivers/usb/mon/mon_bin.c
index f8d9045d668a..0f7a30b7d2d1 100644
--- a/trunk/drivers/usb/mon/mon_bin.c
+++ b/trunk/drivers/usb/mon/mon_bin.c
@@ -1261,7 +1261,7 @@ static int mon_alloc_buff(struct mon_pgmap *map, int npages)
 			return -ENOMEM;
 		}
 		map[n].ptr = (unsigned char *) vaddr;
-		map[n].pg = virt_to_page(vaddr);
+		map[n].pg = virt_to_page((void *) vaddr);
 	}
 	return 0;
 }
diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
index d55a50da2347..a641eb753b8c 100644
--- a/trunk/kernel/perf_counter.c
+++ b/trunk/kernel/perf_counter.c
@@ -2020,7 +2020,7 @@ static int perf_mmap_data_alloc(struct perf_counter *counter, int nr_pages)
 
 static void perf_mmap_free_page(unsigned long addr)
 {
-	struct page *page = virt_to_page(addr);
+	struct page *page = virt_to_page((void *)addr);
 
 	page->mapping = NULL;
 	__free_page(page);
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index e0f2cdf9d8b1..ad7cd1c56b07 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1983,7 +1983,7 @@ void *alloc_pages_exact(size_t size, gfp_t gfp_mask)
 		unsigned long alloc_end = addr + (PAGE_SIZE << order);
 		unsigned long used = addr + PAGE_ALIGN(size);
 
-		split_page(virt_to_page(addr), order);
+		split_page(virt_to_page((void *)addr), order);
 		while (used < alloc_end) {
 			free_page(used);
 			used += PAGE_SIZE;