diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/slab.h | 1 | ||||
-rw-r--r-- | include/net/request_sock.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index d7ee28e51330..34b046ea88f1 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_ATOMIC GFP_ATOMIC | ||
23 | #define SLAB_KERNEL GFP_KERNEL | 22 | #define SLAB_KERNEL GFP_KERNEL |
24 | #define SLAB_DMA GFP_DMA | 23 | #define SLAB_DMA GFP_DMA |
25 | 24 | ||
diff --git a/include/net/request_sock.h b/include/net/request_sock.h index e37baaf2080b..426f0fe774ef 100644 --- a/include/net/request_sock.h +++ b/include/net/request_sock.h | |||
@@ -60,7 +60,7 @@ struct request_sock { | |||
60 | 60 | ||
61 | static inline struct request_sock *reqsk_alloc(const struct request_sock_ops *ops) | 61 | static inline struct request_sock *reqsk_alloc(const struct request_sock_ops *ops) |
62 | { | 62 | { |
63 | struct request_sock *req = kmem_cache_alloc(ops->slab, SLAB_ATOMIC); | 63 | struct request_sock *req = kmem_cache_alloc(ops->slab, GFP_ATOMIC); |
64 | 64 | ||
65 | if (req != NULL) | 65 | if (req != NULL) |
66 | req->rsk_ops = ops; | 66 | req->rsk_ops = ops; |