Signed-off-by: Alexey Dobriyan <[email protected]>
---
include/linux/gfp.h | 4 ++--
include/linux/slab.h | 6 +++---
include/linux/string.h | 2 +-
mm/mempool.c | 2 +-
mm/slab.c | 12 +++++++-----
5 files changed, 14 insertions(+), 12 deletions(-)
diff -uprN a/include/linux/gfp.h b/include/linux/gfp.h
--- a/include/linux/gfp.h 2005-06-28 13:35:40.000000000 +0400
+++ b/include/linux/gfp.h 2005-06-29 00:07:10.000000000 +0400
@@ -12,8 +12,8 @@ struct vm_area_struct;
* GFP bitmasks..
*/
/* Zone modifiers in GFP_ZONEMASK (see linux/mmzone.h - low two bits) */
-#define __GFP_DMA 0x01
-#define __GFP_HIGHMEM 0x02
+#define __GFP_DMA 0x01u
+#define __GFP_HIGHMEM 0x02u
/*
* Action modifiers - doesn't change the zoning
diff -uprN a/include/linux/slab.h b/include/linux/slab.h
--- a/include/linux/slab.h 2005-06-28 13:35:48.000000000 +0400
+++ b/include/linux/slab.h 2005-06-29 00:07:37.000000000 +0400
@@ -65,7 +65,7 @@ extern void *kmem_cache_alloc(kmem_cache
extern void kmem_cache_free(kmem_cache_t *, void *);
extern unsigned int kmem_cache_size(kmem_cache_t *);
extern const char *kmem_cache_name(kmem_cache_t *);
-extern kmem_cache_t *kmem_find_general_cachep(size_t size, int gfpflags);
+extern kmem_cache_t *kmem_find_general_cachep(size_t size, unsigned int __nocast gfpflags);
/* Size description struct for general caches. */
struct cache_sizes {
@@ -105,13 +105,13 @@ extern unsigned int ksize(const void *);
#ifdef CONFIG_NUMA
extern void *kmem_cache_alloc_node(kmem_cache_t *, int flags, int node);
-extern void *kmalloc_node(size_t size, int flags, int node);
+extern void *kmalloc_node(size_t size, unsigned int __nocast flags, int node);
#else
static inline void *kmem_cache_alloc_node(kmem_cache_t *cachep, int flags, int node)
{
return kmem_cache_alloc(cachep, flags);
}
-static inline void *kmalloc_node(size_t size, int flags, int node)
+static inline void *kmalloc_node(size_t size, unsigned int __nocast flags, int node)
{
return kmalloc(size, flags);
}
diff -uprN a/include/linux/string.h b/include/linux/string.h
--- a/include/linux/string.h 2005-06-28 13:35:48.000000000 +0400
+++ b/include/linux/string.h 2005-06-29 00:07:37.000000000 +0400
@@ -88,7 +88,7 @@ extern int memcmp(const void *,const voi
extern void * memchr(const void *,int,__kernel_size_t);
#endif
-extern char *kstrdup(const char *s, int gfp);
+extern char *kstrdup(const char *s, unsigned int __nocast gfp);
#ifdef __cplusplus
}
diff -uprN a/mm/mempool.c b/mm/mempool.c
--- a/mm/mempool.c 2005-06-28 13:35:59.000000000 +0400
+++ b/mm/mempool.c 2005-06-29 00:07:33.000000000 +0400
@@ -205,7 +205,7 @@ void * mempool_alloc(mempool_t *pool, un
void *element;
unsigned long flags;
wait_queue_t wait;
- int gfp_temp;
+ unsigned int gfp_temp;
might_sleep_if(gfp_mask & __GFP_WAIT);
diff -uprN a/mm/slab.c b/mm/slab.c
--- a/mm/slab.c 2005-06-28 13:35:59.000000000 +0400
+++ b/mm/slab.c 2005-06-29 00:07:37.000000000 +0400
@@ -584,7 +584,8 @@ static inline struct array_cache *ac_dat
return cachep->array[smp_processor_id()];
}
-static inline kmem_cache_t *__find_general_cachep(size_t size, int gfpflags)
+static inline kmem_cache_t *__find_general_cachep(size_t size,
+ unsigned int __nocast gfpflags)
{
struct cache_sizes *csizep = malloc_sizes;
@@ -608,7 +609,8 @@ static inline kmem_cache_t *__find_gener
return csizep->cs_cachep;
}
-kmem_cache_t *kmem_find_general_cachep(size_t size, int gfpflags)
+kmem_cache_t *kmem_find_general_cachep(size_t size,
+ unsigned int __nocast gfpflags)
{
return __find_general_cachep(size, gfpflags);
}
@@ -2100,7 +2102,7 @@ cache_alloc_debugcheck_before(kmem_cache
#if DEBUG
static void *
cache_alloc_debugcheck_after(kmem_cache_t *cachep,
- unsigned long flags, void *objp, void *caller)
+ unsigned int __nocast flags, void *objp, void *caller)
{
if (!objp)
return objp;
@@ -2439,7 +2441,7 @@ got_slabp:
}
EXPORT_SYMBOL(kmem_cache_alloc_node);
-void *kmalloc_node(size_t size, int flags, int node)
+void *kmalloc_node(size_t size, unsigned int __nocast flags, int node)
{
kmem_cache_t *cachep;
@@ -3091,7 +3093,7 @@ unsigned int ksize(const void *objp)
* @s: the string to duplicate
* @gfp: the GFP mask used in the kmalloc() call when allocating memory
*/
-char *kstrdup(const char *s, int gfp)
+char *kstrdup(const char *s, unsigned int __nocast gfp)
{
size_t len;
char *buf;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
