diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-10-17 22:30:32 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-10-20 19:07:51 -0400 |
| commit | 553d6f107a3e90d451fcac8a88c07746dcb340cf (patch) | |
| tree | 9cb62d5dcdd1ef09815cea97ccacefe348703394 /include/linux | |
| parent | 4f9293b045cf32dfc629ce300180d311aba8f53a (diff) | |
Update bcachefs sources to 1dbc147a6eb0 bcachefs: Add version check for bch_btree_ptr_v2.sectors_written validate
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/slab.h | 3 | ||||
| -rw-r--r-- | include/linux/wait.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h index db6a5d55..24df2cc5 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -111,6 +111,7 @@ static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags) #define kzfree(p) free((void *) p) #define kvmalloc(size, flags) kmalloc(size, flags) +#define kvmalloc_noprof(size, flags) kmalloc(size, flags) #define kvzalloc(size, flags) kzalloc(size, flags) #define kvfree(p) kfree(p) @@ -274,6 +275,8 @@ static inline void *vmalloc(unsigned long size) return __vmalloc(size, GFP_KERNEL); } +#define vmalloc_noprof(...) vmalloc(__VA_ARGS__) + static inline void *vzalloc(unsigned long size) { return __vmalloc(size, GFP_KERNEL|__GFP_ZERO); diff --git a/include/linux/wait.h b/include/linux/wait.h index 4b9cbf38..d0fd3dca 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -96,6 +96,7 @@ do { \ #define wait_event_freezable(wq, condition) ({wait_event(wq, condition); 0; }) #define wait_event_killable(wq, condition) ({wait_event(wq, condition); 0; }) #define wait_event_interruptible(wq, condition) ({wait_event(wq, condition); 0; }) +#define wait_event_state(wq, condition, state) ({wait_event(wq, condition); 0; }) #define __wait_event_timeout(wq, condition, timeout) \ ___wait_event(wq, ___wait_cond_timeout(condition), \ |