aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/fs.h2
-rw-r--r--include/linux/rmap.h2
-rw-r--r--include/linux/slab.h1
-rw-r--r--include/linux/taskstats_kern.h2
4 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index a8039c8d8cbb..94b831b8157c 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1483,7 +1483,7 @@ extern void __init vfs_caches_init(unsigned long);
1483 1483
1484extern struct kmem_cache *names_cachep; 1484extern struct kmem_cache *names_cachep;
1485 1485
1486#define __getname() kmem_cache_alloc(names_cachep, SLAB_KERNEL) 1486#define __getname() kmem_cache_alloc(names_cachep, GFP_KERNEL)
1487#define __putname(name) kmem_cache_free(names_cachep, (void *)(name)) 1487#define __putname(name) kmem_cache_free(names_cachep, (void *)(name))
1488#ifndef CONFIG_AUDITSYSCALL 1488#ifndef CONFIG_AUDITSYSCALL
1489#define putname(name) __putname(name) 1489#define putname(name) __putname(name)
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index db2c1df4fef9..61c2ab634b00 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -34,7 +34,7 @@ extern kmem_cache_t *anon_vma_cachep;
34 34
35static inline struct anon_vma *anon_vma_alloc(void) 35static inline struct anon_vma *anon_vma_alloc(void)
36{ 36{
37 return kmem_cache_alloc(anon_vma_cachep, SLAB_KERNEL); 37 return kmem_cache_alloc(anon_vma_cachep, GFP_KERNEL);
38} 38}
39 39
40static inline void anon_vma_free(struct anon_vma *anon_vma) 40static inline void anon_vma_free(struct anon_vma *anon_vma)
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 34b046ea88f1..639f65efa46e 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -19,7 +19,6 @@ typedef struct kmem_cache kmem_cache_t;
19#include <asm/cache.h> /* kmalloc_sizes.h needs L1_CACHE_BYTES */ 19#include <asm/cache.h> /* kmalloc_sizes.h needs L1_CACHE_BYTES */
20 20
21/* flags for kmem_cache_alloc() */ 21/* flags for kmem_cache_alloc() */
22#define SLAB_KERNEL GFP_KERNEL
23#define SLAB_DMA GFP_DMA 22#define SLAB_DMA GFP_DMA
24 23
25/* flags to pass to kmem_cache_create(). 24/* flags to pass to kmem_cache_create().
diff --git a/include/linux/taskstats_kern.h b/include/linux/taskstats_kern.h
index 6562a2050a25..f81a5af8a4f8 100644
--- a/include/linux/taskstats_kern.h
+++ b/include/linux/taskstats_kern.h
@@ -35,7 +35,7 @@ static inline void taskstats_tgid_alloc(struct task_struct *tsk)
35 return; 35 return;
36 36
37 /* No problem if kmem_cache_zalloc() fails */ 37 /* No problem if kmem_cache_zalloc() fails */
38 stats = kmem_cache_zalloc(taskstats_cache, SLAB_KERNEL); 38 stats = kmem_cache_zalloc(taskstats_cache, GFP_KERNEL);
39 39
40 spin_lock_irq(&tsk->sighand->siglock); 40 spin_lock_irq(&tsk->sighand->siglock);
41 if (!sig->stats) { 41 if (!sig->stats) {