Commit 5bfd7560 authored by Kevin Cernekee's avatar Kevin Cernekee Committed by Linus Torvalds

Fix virt_to_phys() warnings

These warnings were observed on MIPS32 using 2.6.31-rc1 and gcc-4.2.0:

mm/page_alloc.c: In function 'alloc_pages_exact':
mm/page_alloc.c:1986: warning: passing argument 1 of 'virt_to_phys' makes pointer from integer without a cast

drivers/usb/mon/mon_bin.c: In function 'mon_alloc_buff':
drivers/usb/mon/mon_bin.c:1264: warning: passing argument 1 of 'virt_to_phys' makes pointer from integer without a cast

[akpm@linux-foundation.org: fix kernel/perf_counter.c too]
Signed-off-by: default avatarKevin Cernekee <cernekee@gmail.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c8236db9
...@@ -1261,7 +1261,7 @@ static int mon_alloc_buff(struct mon_pgmap *map, int npages) ...@@ -1261,7 +1261,7 @@ static int mon_alloc_buff(struct mon_pgmap *map, int npages)
return -ENOMEM; return -ENOMEM;
} }
map[n].ptr = (unsigned char *) vaddr; map[n].ptr = (unsigned char *) vaddr;
map[n].pg = virt_to_page(vaddr); map[n].pg = virt_to_page((void *) vaddr);
} }
return 0; return 0;
} }
......
...@@ -2020,7 +2020,7 @@ fail: ...@@ -2020,7 +2020,7 @@ fail:
static void perf_mmap_free_page(unsigned long addr) 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; page->mapping = NULL;
__free_page(page); __free_page(page);
......
...@@ -1983,7 +1983,7 @@ void *alloc_pages_exact(size_t size, gfp_t gfp_mask) ...@@ -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 alloc_end = addr + (PAGE_SIZE << order);
unsigned long used = addr + PAGE_ALIGN(size); 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) { while (used < alloc_end) {
free_page(used); free_page(used);
used += PAGE_SIZE; used += PAGE_SIZE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment