---

yaml --- r: 154911 b: refs/heads/master c: 5bfd756 h: refs/heads/master i: 154909: 7ea22ca 154907: ea403aa 154903: de8b08e 154895: 3aa02e9 154879: 2fa3b1b v: v3
git-mirror · Jul 6, 2009 · 651e797 · 651e797
1 parent d5a3d42
commit 651e797
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;