summary refs log tree commit diff
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-10-28 14:29:43 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-10-28 14:29:43 +0100
commitf339ab3d6c59f8f898c165384aa2b6a0ae5d4c1c (patch)
treec17ec50ffe9544c8c67a6532644bb0a1cedc53b7 /arch
parent674c04538284736c4a44224c78cb784b2c972f98 (diff)
downloadlinux-f339ab3d6c59f8f898c165384aa2b6a0ae5d4c1c.tar.gz
[ARM] Fix sparse warnings
Fix sparse warnings in arch/arm/kernel/module.c,
arch/arm/mm/consistent.c, drivers/pcmcia/sa1111_generic.c,
and platform support files.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/module.c1
-rw-r--r--arch/arm/mm/consistent.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
index 1a85cfdad5ac..6055e1427ba3 100644
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
@@ -11,6 +11,7 @@
  */
 #include <linux/config.h>
 #include <linux/module.h>
+#include <linux/moduleloader.h>
 #include <linux/kernel.h>
 #include <linux/elf.h>
 #include <linux/vmalloc.h>
diff --git a/arch/arm/mm/consistent.c b/arch/arm/mm/consistent.c
index 26356ce4da54..0f32de977f5e 100644
--- a/arch/arm/mm/consistent.c
+++ b/arch/arm/mm/consistent.c
@@ -75,7 +75,7 @@ static struct vm_region consistent_head = {
 };
 
 static struct vm_region *
-vm_region_alloc(struct vm_region *head, size_t size, int gfp)
+vm_region_alloc(struct vm_region *head, size_t size, unsigned int gfp)
 {
 	unsigned long addr = head->vm_start, end = head->vm_end - size;
 	unsigned long flags;
@@ -133,8 +133,8 @@ static struct vm_region *vm_region_find(struct vm_region *head, unsigned long ad
 #endif
 
 static void *
-__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, int gfp,
-	    pgprot_t prot)
+__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
+	    unsigned int gfp, pgprot_t prot)
 {
 	struct page *page;
 	struct vm_region *c;