summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2005-07-27 11:43:27 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-27 16:25:47 -0700
commitc10b873695c6a1de0d8ebab40b525575ca576683 (patch)
treef0d5f3ce15c8259209dcea621b0b06396bbac25e /include/linux
parent8c86cb127b2b7614903cb2a38db3207488a0405a (diff)
downloadlinux-3.10-c10b873695c6a1de0d8ebab40b525575ca576683.tar.gz
linux-3.10-c10b873695c6a1de0d8ebab40b525575ca576683.tar.bz2
linux-3.10-c10b873695c6a1de0d8ebab40b525575ca576683.zip
[PATCH] Really __nocast-annotate kmalloc_node()
One chunk was lost somewhere between my and Andrew's machine. Noticed by Victor Fusco. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/slab.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 4c8e552471b..80b2dfde2e8 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -111,7 +111,7 @@ static inline void *kmem_cache_alloc_node(kmem_cache_t *cachep, int flags, int n
{
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);
}