iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] propagate __nocast annotations

Browse Source 
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Alexey Dobriyan 2005-07-07 17:56:58 -07:00 committed by Linus Torvalds
parent b84c21572d
commit 0db925af1d
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/gfp.h
View File

@ -12,8 +12,8 @@ struct vm_area_struct;
* GFP bitmasks.. * GFP bitmasks..
*/ */
/* Zone modifiers in GFP_ZONEMASK (see linux/mmzone.h - low two bits) */ /* Zone modifiers in GFP_ZONEMASK (see linux/mmzone.h - low two bits) */
#define __GFP_DMA 0x01 #define __GFP_DMA 0x01u
#define __GFP_HIGHMEM 0x02 #define __GFP_HIGHMEM 0x02u
/* /*
* Action modifiers - doesn't change the zoning * Action modifiers - doesn't change the zoning

4
include/linux/slab.h
View File

@ -65,7 +65,7 @@ extern void *kmem_cache_alloc(kmem_cache_t *, unsigned int __nocast);
extern void kmem_cache_free(kmem_cache_t *, void *); extern void kmem_cache_free(kmem_cache_t *, void *);
extern unsigned int kmem_cache_size(kmem_cache_t *); extern unsigned int kmem_cache_size(kmem_cache_t *);
extern const char *kmem_cache_name(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. */ /* Size description struct for general caches. */
struct cache_sizes { struct cache_sizes {
@ -105,7 +105,7 @@ extern unsigned int ksize(const void *);
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
extern void *kmem_cache_alloc_node(kmem_cache_t *, int flags, int node); 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 #else
static inline void *kmem_cache_alloc_node(kmem_cache_t *cachep, int flags, int node) static inline void *kmem_cache_alloc_node(kmem_cache_t *cachep, int flags, int node)
{ {

2
include/linux/string.h
View File

@ -88,7 +88,7 @@ extern int memcmp(const void *,const void *,__kernel_size_t);
extern void * memchr(const void *,int,__kernel_size_t); extern void * memchr(const void *,int,__kernel_size_t);
#endif #endif
extern char *kstrdup(const char *s, int gfp); extern char *kstrdup(const char *s, unsigned int __nocast gfp);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
mm/mempool.c
View File

@ -205,7 +205,7 @@ void * mempool_alloc(mempool_t *pool, unsigned int __nocast gfp_mask)
void *element; void *element;
unsigned long flags; unsigned long flags;
wait_queue_t wait; wait_queue_t wait;
int gfp_temp; unsigned int gfp_temp;
might_sleep_if(gfp_mask & __GFP_WAIT); might_sleep_if(gfp_mask & __GFP_WAIT);

12
mm/slab.c
View File

@ -584,7 +584,8 @@ static inline struct array_cache *ac_data(kmem_cache_t *cachep)
return cachep->array[smp_processor_id()]; 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; struct cache_sizes *csizep = malloc_sizes;
@ -608,7 +609,8 @@ static inline kmem_cache_t *__find_general_cachep(size_t size, int gfpflags)
return csizep->cs_cachep; 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); return __find_general_cachep(size, gfpflags);
} }
@ -2100,7 +2102,7 @@ cache_alloc_debugcheck_before(kmem_cache_t *cachep, unsigned int __nocast flags)
#if DEBUG #if DEBUG
static void * static void *
cache_alloc_debugcheck_after(kmem_cache_t *cachep, 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) if (!objp)
return objp; return objp;
@ -2442,7 +2444,7 @@ got_slabp:
} }
EXPORT_SYMBOL(kmem_cache_alloc_node); 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; kmem_cache_t *cachep;
@ -3094,7 +3096,7 @@ unsigned int ksize(const void *objp)
* @s: the string to duplicate * @s: the string to duplicate
* @gfp: the GFP mask used in the kmalloc() call when allocating memory * @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; size_t len;
char *buf; char *buf;