diff options
| author | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 22:12:56 -0400 |
|---|---|---|
| committer | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 22:12:56 -0400 |
| commit | 2868bd281fef21d1e73d6b7648a41efc3d75f10c (patch) | |
| tree | 0ad821cfcc9e3f9e8b662d026bec6bb6d4ce69ac /include/linux/slab.h | |
| parent | 6d376756f2cf3478d5a4fdb8d18e958948366b9d (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge /scratch/Ksrc/linux-git/
Diffstat (limited to 'include/linux/slab.h')
| -rw-r--r-- | include/linux/slab.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index 4c8e552471b0..80b2dfde2e80 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 | |||
| 111 | { | 111 | { |
| 112 | return kmem_cache_alloc(cachep, flags); | 112 | return kmem_cache_alloc(cachep, flags); |
| 113 | } | 113 | } |
| 114 | static inline void *kmalloc_node(size_t size, int flags, int node) | 114 | static inline void *kmalloc_node(size_t size, unsigned int __nocast flags, int node) |
| 115 | { | 115 | { |
| 116 | return kmalloc(size, flags); | 116 | return kmalloc(size, flags); |
| 117 | } | 117 | } |