From 305889882868fa6e2402afbe264673a0d1c6d472 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 22 Jun 2012 12:45:15 +0200 Subject: qsort: declare strcmp_compar publically Signed-off-by: Sascha Hauer --- include/qsort.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/qsort.h b/include/qsort.h index bbb23595b2..d279dc2810 100644 --- a/include/qsort.h +++ b/include/qsort.h @@ -4,4 +4,6 @@ void qsort(void *base, size_t nel, size_t width, int (*comp)(const void *, const void *)); +int strcmp_compar(const void *p1, const void *p2); + #endif /* __QSORT_H */ -- cgit v1.2.3 From 6f5ea13f28a5bf097ad597c0990d15b3a25b20c4 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 22 Jun 2012 12:47:22 +0200 Subject: Do not use iomem space for dev_get_mem_region It is mostly used for mmapping sdram which is no iomem. Signed-off-by: Sascha Hauer --- drivers/base/driver.c | 6 +++--- include/driver.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 81cedca1db..2efd563609 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -241,15 +241,15 @@ static struct resource *dev_get_resource(struct device_d *dev, int num) return NULL; } -void __iomem *dev_get_mem_region(struct device_d *dev, int num) +void *dev_get_mem_region(struct device_d *dev, int num) { struct resource *res; res = dev_get_resource(dev, num); if (!res) - return res; + return NULL; - return (void __force __iomem *)res->start; + return (void __force *)res->start; } EXPORT_SYMBOL(dev_get_mem_region); diff --git a/include/driver.h b/include/driver.h index 09dd1e45c0..470ae2d5f8 100644 --- a/include/driver.h +++ b/include/driver.h @@ -183,7 +183,7 @@ static inline const char *dev_name(const struct device_d *dev) /* * get register base 'num' for a device */ -void __iomem *dev_get_mem_region(struct device_d *dev, int num); +void *dev_get_mem_region(struct device_d *dev, int num); /* * exlusively request register base 'num' for a device -- cgit v1.2.3 From 27c5d37ecca94af584e4794ca7175648e766df54 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 22 Jun 2012 12:49:03 +0200 Subject: define __user empty There is no seperate user address space, so do not generate sparse warnings for this. Signed-off-by: Sascha Hauer --- drivers/mtd/ubi/ubi-barebox.h | 1 - include/linux/compiler.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'include') diff --git a/drivers/mtd/ubi/ubi-barebox.h b/drivers/mtd/ubi/ubi-barebox.h index d23228f648..72f29a61e7 100644 --- a/drivers/mtd/ubi/ubi-barebox.h +++ b/drivers/mtd/ubi/ubi-barebox.h @@ -135,7 +135,6 @@ struct kmem_cache { int i; }; #define GFP_KERNEL 0 #define GFP_NOFS 1 -#define __user #define __init #define __exit diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 5be3dab4a6..cc8c4de43e 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -4,7 +4,7 @@ #ifndef __ASSEMBLY__ #ifdef __CHECKER__ -# define __user __attribute__((noderef, address_space(1))) +# define __user /* no user address space in barebox */ # define __kernel /* default address space */ # define __safe __attribute__((safe)) # define __force __attribute__((force)) -- cgit v1.2.3