Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/usb/mon/mon_bin.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

kernel/perf_counter.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

mm/page_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;