diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/decnet/dn_table.c | 2 | ||||
| -rw-r--r-- | net/ipv4/fib_hash.c | 4 | ||||
| -rw-r--r-- | net/ipv4/fib_trie.c | 4 | ||||
| -rw-r--r-- | net/socket.c | 2 | ||||
| -rw-r--r-- | net/sunrpc/rpc_pipe.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c index bdbc3f43166..101e5ccaf09 100644 --- a/net/decnet/dn_table.c +++ b/net/decnet/dn_table.c | |||
| @@ -590,7 +590,7 @@ create: | |||
| 590 | 590 | ||
| 591 | replace: | 591 | replace: |
| 592 | err = -ENOBUFS; | 592 | err = -ENOBUFS; |
| 593 | new_f = kmem_cache_alloc(dn_hash_kmem, SLAB_KERNEL); | 593 | new_f = kmem_cache_alloc(dn_hash_kmem, GFP_KERNEL); |
| 594 | if (new_f == NULL) | 594 | if (new_f == NULL) |
| 595 | goto out; | 595 | goto out; |
| 596 | 596 | ||
diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c index 107bb6cbb0b..4463443e42c 100644 --- a/net/ipv4/fib_hash.c +++ b/net/ipv4/fib_hash.c | |||
| @@ -485,13 +485,13 @@ static int fn_hash_insert(struct fib_table *tb, struct fib_config *cfg) | |||
| 485 | goto out; | 485 | goto out; |
| 486 | 486 | ||
| 487 | err = -ENOBUFS; | 487 | err = -ENOBUFS; |
| 488 | new_fa = kmem_cache_alloc(fn_alias_kmem, SLAB_KERNEL); | 488 | new_fa = kmem_cache_alloc(fn_alias_kmem, GFP_KERNEL); |
| 489 | if (new_fa == NULL) | 489 | if (new_fa == NULL) |
| 490 | goto out; | 490 | goto out; |
| 491 | 491 | ||
| 492 | new_f = NULL; | 492 | new_f = NULL; |
| 493 | if (!f) { | 493 | if (!f) { |
| 494 | new_f = kmem_cache_alloc(fn_hash_kmem, SLAB_KERNEL); | 494 | new_f = kmem_cache_alloc(fn_hash_kmem, GFP_KERNEL); |
| 495 | if (new_f == NULL) | 495 | if (new_f == NULL) |
| 496 | goto out_free_new_fa; | 496 | goto out_free_new_fa; |
| 497 | 497 | ||
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index d17990ec724..6be6caf1af3 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c | |||
| @@ -1187,7 +1187,7 @@ static int fn_trie_insert(struct fib_table *tb, struct fib_config *cfg) | |||
| 1187 | u8 state; | 1187 | u8 state; |
| 1188 | 1188 | ||
| 1189 | err = -ENOBUFS; | 1189 | err = -ENOBUFS; |
| 1190 | new_fa = kmem_cache_alloc(fn_alias_kmem, SLAB_KERNEL); | 1190 | new_fa = kmem_cache_alloc(fn_alias_kmem, GFP_KERNEL); |
| 1191 | if (new_fa == NULL) | 1191 | if (new_fa == NULL) |
| 1192 | goto out; | 1192 | goto out; |
| 1193 | 1193 | ||
| @@ -1232,7 +1232,7 @@ static int fn_trie_insert(struct fib_table *tb, struct fib_config *cfg) | |||
| 1232 | goto out; | 1232 | goto out; |
| 1233 | 1233 | ||
| 1234 | err = -ENOBUFS; | 1234 | err = -ENOBUFS; |
| 1235 | new_fa = kmem_cache_alloc(fn_alias_kmem, SLAB_KERNEL); | 1235 | new_fa = kmem_cache_alloc(fn_alias_kmem, GFP_KERNEL); |
| 1236 | if (new_fa == NULL) | 1236 | if (new_fa == NULL) |
| 1237 | goto out; | 1237 | goto out; |
| 1238 | 1238 | ||
diff --git a/net/socket.c b/net/socket.c index e8db54702a6..4f417c2ddc1 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -236,7 +236,7 @@ static struct inode *sock_alloc_inode(struct super_block *sb) | |||
| 236 | { | 236 | { |
| 237 | struct socket_alloc *ei; | 237 | struct socket_alloc *ei; |
| 238 | 238 | ||
| 239 | ei = kmem_cache_alloc(sock_inode_cachep, SLAB_KERNEL); | 239 | ei = kmem_cache_alloc(sock_inode_cachep, GFP_KERNEL); |
| 240 | if (!ei) | 240 | if (!ei) |
| 241 | return NULL; | 241 | return NULL; |
| 242 | init_waitqueue_head(&ei->socket.wait); | 242 | init_waitqueue_head(&ei->socket.wait); |
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 49dba5febbb..df753d0a884 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
| @@ -143,7 +143,7 @@ static struct inode * | |||
| 143 | rpc_alloc_inode(struct super_block *sb) | 143 | rpc_alloc_inode(struct super_block *sb) |
| 144 | { | 144 | { |
| 145 | struct rpc_inode *rpci; | 145 | struct rpc_inode *rpci; |
| 146 | rpci = (struct rpc_inode *)kmem_cache_alloc(rpc_inode_cachep, SLAB_KERNEL); | 146 | rpci = (struct rpc_inode *)kmem_cache_alloc(rpc_inode_cachep, GFP_KERNEL); |
| 147 | if (!rpci) | 147 | if (!rpci) |
| 148 | return NULL; | 148 | return NULL; |
| 149 | return &rpci->vfs_inode; | 149 | return &rpci->vfs_inode; |
