diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-07-09 15:16:50 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-07-09 15:25:40 -0400 |
| commit | 5d507f795b0b679a67e972a48cbd0854c4ad0f02 (patch) | |
| tree | bf30f9dd1badd504025e836d696d4d2d939108c3 /include | |
| parent | c99a444c5cc242a89845be83236aacd7db628ef5 (diff) | |
Update bcachefs sources to da7d42a9a2 bcachefs: Add new assertions for shutdown path
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/slab.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index 144e333e..a36f6f43 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -20,7 +20,7 @@ #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_noprof(size_t size, gfp_t flags) { unsigned i; void *p; @@ -46,7 +46,7 @@ static inline void *_kmalloc(size_t size, gfp_t flags) return p; } -#define kmalloc _kmalloc +#define kmalloc kmalloc_noprof static inline void *krealloc(void *old, size_t size, gfp_t flags) { @@ -97,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_noprof(gfp_t flags, unsigned int order) { size_t size = PAGE_SIZE << order; unsigned i; @@ -117,12 +117,14 @@ static inline struct page *_alloc_pages(gfp_t flags, unsigned int order) return p; } -#define alloc_pages _alloc_pages +#define alloc_pages alloc_pages_noprof #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_pages_noprof(gfp, order) \ + ((unsigned long) alloc_pages(gfp, order)) #define __get_free_page(gfp) __get_free_pages(gfp, 0) #define __free_pages(page, order) \ |