Commit 838b0ec9 authored by Paul Mackerras's avatar Paul Mackerras

PPC32: fix some minor compile warnings.

parent 95980dc7
...@@ -50,6 +50,8 @@ ...@@ -50,6 +50,8 @@
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/machdep.h> #include <asm/machdep.h>
int map_page(unsigned long va, unsigned long pa, int flags);
/* This function will allocate the requested contiguous pages and /* This function will allocate the requested contiguous pages and
* map them into the kernel's vmalloc() space. This is done so we * map them into the kernel's vmalloc() space. This is done so we
* get unique mapping for these pages, outside of the kernel's 1:1 * get unique mapping for these pages, outside of the kernel's 1:1
...@@ -96,7 +98,7 @@ void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle) ...@@ -96,7 +98,7 @@ void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle)
/* This gives us the real physical address of the first page. /* This gives us the real physical address of the first page.
*/ */
*dma_handle = pa = virt_to_bus(page); *dma_handle = pa = virt_to_bus((void *)page);
flags = _PAGE_KERNEL | _PAGE_NO_CACHE; flags = _PAGE_KERNEL | _PAGE_NO_CACHE;
...@@ -151,10 +153,10 @@ void consistent_sync(void *vaddr, size_t size, int direction) ...@@ -151,10 +153,10 @@ void consistent_sync(void *vaddr, size_t size, int direction)
*/ */
void consistent_sync_page(struct page *page, unsigned long offset, void consistent_sync_page(struct page *page, unsigned long offset,
size_t size, int direction) size_t size, int direction)
{ {
unsigned long start; unsigned long start;
start = page_address(page) + offset; start = page_address(page) + offset;
consistent_sync(start, size, direction); consistent_sync((void *)start, size, direction);
} }
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/string.h>
#include <linux/nvram.h> #include <linux/nvram.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
......
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