diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-07-13 13:17:07 +0900 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2015-07-22 07:30:44 -0600 |
commit | 6b9f9eadffb5f64801746593784e12f07f2fadd0 (patch) | |
tree | a7175969f30db000d6d1bcc049e5f2a55e042314 /include | |
parent | ebc3328cccc2bc7968fbd179e8e30fa1282b391a (diff) | |
download | u-boot-6b9f9eadffb5f64801746593784e12f07f2fadd0.zip u-boot-6b9f9eadffb5f64801746593784e12f07f2fadd0.tar.gz u-boot-6b9f9eadffb5f64801746593784e12f07f2fadd0.tar.bz2 |
linux_compat: handle __GFP_ZERO in kmalloc()
Currently, kzalloc() returns zero-filled memory, while kmalloc()
simply ignores the second argument and never fills the memory
area with zeros.
I want kmalloc(size, __GFP_ZERO) to behave as kzalloc() does,
which will make it easier to add more memory allocator variants.
With the introduction of __GFP_ZERO flag, going forward, kzmalloc()
variants can fall back to kmalloc() enabling the __GFP_ZERO flag.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
Acked-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/compat.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h index a3d136b..fbebf91 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -36,8 +36,19 @@ extern struct p_current *current; #define KERN_INFO #define KERN_DEBUG +#define GFP_ATOMIC ((gfp_t) 0) +#define GFP_KERNEL ((gfp_t) 0) +#define GFP_NOFS ((gfp_t) 0) +#define GFP_USER ((gfp_t) 0) +#define __GFP_NOWARN ((gfp_t) 0) +#define __GFP_ZERO ((__force gfp_t)0x8000u) /* Return zeroed page on success */ + void *kmalloc(size_t size, int flags); -void *kzalloc(size_t size, int flags); + +static inline void *kzalloc(size_t size, gfp_t flags) +{ + return kmalloc(size, flags | __GFP_ZERO); +} #define vmalloc(size) kmalloc(size, 0) #define __vmalloc(size, flags, pgsz) kmalloc(size, flags) static inline void *vzalloc(unsigned long size) @@ -77,13 +88,6 @@ void *kmem_cache_alloc(struct kmem_cache *obj, int flag); /* drivers/char/random.c */ #define get_random_bytes(...) -/* idr.c */ -#define GFP_ATOMIC ((gfp_t) 0) -#define GFP_KERNEL ((gfp_t) 0) -#define GFP_NOFS ((gfp_t) 0) -#define GFP_USER ((gfp_t) 0) -#define __GFP_NOWARN ((gfp_t) 0) - /* include/linux/leds.h */ struct led_trigger {}; |