Update bcachefs sources to 3856459b1b bcachefs: bch2_btree_iter_peek_node_and_restart()

[bcachefs-tools-debian] / include / linux / slab.h

diff --git a/include/linux/slab.h b/include/linux/slab.h
index ff122ff9abda259e6ad8574b7544c5491e875f45..144e333e0a0b39dfe7746aa2e494f6807eb7a2f3 100644 (file)
--- 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)