diff options
| author | Michal Simek <monstr@monstr.eu> | 2011-02-07 11:42:37 +0100 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2011-03-09 08:09:58 +0100 |
| commit | cd44da154241170be3f1fadb1f2ca689f6802628 (patch) | |
| tree | b27974304a6ae84779029f0d4807d8eed8d02a2e /arch/microblaze | |
| parent | c1df53b33c818d28d5e3b287530373e78a7904e7 (diff) | |
| download | kernel_samsung_tuna-cd44da154241170be3f1fadb1f2ca689f6802628.zip kernel_samsung_tuna-cd44da154241170be3f1fadb1f2ca689f6802628.tar.gz kernel_samsung_tuna-cd44da154241170be3f1fadb1f2ca689f6802628.tar.bz2 | |
microblaze: Fix sparse warning - consistent_alloc function
Warning in dma.c was caused by incorrect type in consistent_alloc function.
Warning log:
CHECK arch/microblaze/kernel/dma.c
arch/microblaze/kernel/dma.c:53:26: warning: incorrect type in argument 1 (different base types)
arch/microblaze/kernel/dma.c:53:26: expected int [signed] gfp
arch/microblaze/kernel/dma.c:53:26: got restricted unsigned int [usertype] flag
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/include/asm/pgtable.h | 2 | ||||
| -rw-r--r-- | arch/microblaze/mm/consistent.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h index 885574a..b2af423 100644 --- a/arch/microblaze/include/asm/pgtable.h +++ b/arch/microblaze/include/asm/pgtable.h @@ -572,7 +572,7 @@ void __init *early_get_page(void); extern unsigned long ioremap_bot, ioremap_base; -void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle); +void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle); void consistent_free(size_t size, void *vaddr); void consistent_sync(void *vaddr, size_t size, int direction); void consistent_sync_page(struct page *page, unsigned long offset, diff --git a/arch/microblaze/mm/consistent.c b/arch/microblaze/mm/consistent.c index 5a59dad..a1e2e18 100644 --- a/arch/microblaze/mm/consistent.c +++ b/arch/microblaze/mm/consistent.c @@ -59,7 +59,7 @@ * uncached region. This will no doubt cause big problems if memory allocated * here is not also freed properly. -- JW */ -void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle) +void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle) { unsigned long order, vaddr; void *ret; |