diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-03-28 05:21:24 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2019-03-28 05:28:38 -0400 |
| commit | 133dfeb64843af65a018be770eb005363ca59bd9 (patch) | |
| tree | 6d37383fdb83a5bc618ec506fd1e14c22d7a32c2 /include | |
| parent | 365d3450058ba0a8d282d8155bfcc2057837ab95 (diff) | |
Update bcachefs sources to d868a87c67 bcachefs: fix initial gc
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/bitops.h | 6 | ||||
| -rw-r--r-- | include/linux/kernel.h | 2 | ||||
| -rw-r--r-- | include/linux/printk.h | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h index dc2927b3..f2183d54 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -120,6 +120,12 @@ static inline unsigned long hweight_long(unsigned long w) return __builtin_popcountl(w); } +static inline unsigned long hweight64(u64 w) +{ + return __builtin_popcount((u32) w) + + __builtin_popcount(w >> 32); +} + static inline unsigned long hweight8(unsigned long w) { return __builtin_popcountl(w); diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 9dc0fef1..10d94c5e 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -217,4 +217,6 @@ struct qstr { #define QSTR_INIT(n,l) { { { .len = l } }, .name = n } +#define POISON_FREE 0x6b + #endif diff --git a/include/linux/printk.h b/include/linux/printk.h index 8f8dd6b9..bc1619f7 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -45,6 +45,7 @@ static inline int scnprintf(char * buf, size_t size, const char * fmt, ...) } #define printk(...) printf(__VA_ARGS__) +#define vprintk(...) vprintf(__VA_ARGS__) #define no_printk(fmt, ...) \ ({ \ |