diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-03-06 02:35:56 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-03-06 04:11:50 -0500 |
| commit | 0206d42daf4c4bd3bbcfa15a2bef34319524db49 (patch) | |
| tree | a51d233e8ad9e9e730d1582519950f5af10532cd /include/linux/slab.h | |
| parent | 61b25f2dd21e1abe11572f4065e75c9c4c304599 (diff) | |
Update bcachefs sources to 3856459b1b bcachefs: bch2_btree_iter_peek_node_and_restart()
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'include/linux/slab.h')
| -rw-r--r-- | include/linux/slab.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index ff122ff9..144e333e 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -15,10 +15,12 @@ #include <stdlib.h> #include <sys/mman.h> +#define alloc_hooks(_do, ...) _do + #define ARCH_KMALLOC_MINALIGN 16 #define KMALLOC_MAX_SIZE SIZE_MAX -static inline void *kmalloc(size_t size, gfp_t flags) +static inline void *_kmalloc(size_t size, gfp_t flags) { unsigned i; void *p; @@ -44,6 +46,7 @@ static inline void *kmalloc(size_t size, gfp_t flags) return p; } +#define kmalloc _kmalloc static inline void *krealloc(void *old, size_t size, gfp_t flags) { @@ -94,7 +97,7 @@ static inline void *krealloc_array(void *p, size_t new_n, size_t new_size, gfp_t #define kvzalloc(size, flags) kzalloc(size, flags) #define kvfree(p) kfree(p) -static inline struct page *alloc_pages(gfp_t flags, unsigned int order) +static inline struct page *_alloc_pages(gfp_t flags, unsigned int order) { size_t size = PAGE_SIZE << order; unsigned i; @@ -114,9 +117,11 @@ static inline struct page *alloc_pages(gfp_t flags, unsigned int order) return p; } +#define alloc_pages _alloc_pages #define alloc_page(gfp) alloc_pages(gfp, 0) +#define _get_free_pages(gfp, order) ((unsigned long) alloc_pages(gfp, order)) #define __get_free_pages(gfp, order) ((unsigned long) alloc_pages(gfp, order)) #define __get_free_page(gfp) __get_free_pages(gfp, 0) |