diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2024-07-12 14:38:07 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2024-07-12 14:42:54 -0400 |
| commit | a1764e00cde2c0de798588782f2cc5a2bb307045 (patch) | |
| tree | 853d825c8b10f560ab55d72f1930c5db27f4d3d0 /include | |
| parent | 4be409afea5fb4325eecf78d29dc463fcd9c3e31 (diff) | |
Update bcachefs sources to 47d1e7a86242 bcachefs: drop packed, aligned from bkey_inode_bufv1.9.3
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/console.h | 5 | ||||
| -rw-r--r-- | include/linux/sched.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index d01aa9a2..31aaa087 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -1,7 +1,8 @@ #ifndef _LINUX_CONSOLE_H_ #define _LINUX_CONSOLE_H_ -#define console_lock() -#define console_unlock() +#define console_lock() do {} while (0) +#define console_trylock() true +#define console_unlock() do {} while (0) #endif /* _LINUX_CONSOLE_H */ diff --git a/include/linux/sched.h b/include/linux/sched.h index fedb1c3c..99d6a47a 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -60,6 +60,7 @@ #define PF_FROZEN 0x00010000 /* frozen for system suspend */ #define PF_FSTRANS 0x00020000 /* inside a filesystem transaction */ #define PF_KSWAPD 0x00040000 /* I am kswapd */ +#define PF_MEMALLOC_NOFS 0x00040000 /* All allocations inherit GFP_NOFS. See memalloc_nfs_save() */ #define PF_MEMALLOC_NOIO 0x00080000 /* Allocating memory without IO involved */ #define PF_LESS_THROTTLE 0x00100000 /* Throttle me less: I clean memory */ #define PF_KTHREAD 0x00200000 /* I am a kernel thread */ |