diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2025-07-14 17:16:28 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2025-07-14 17:16:28 +0200 |
| commit | 8f2146159b3a24d4fde0479c5e19f31908419004 (patch) | |
| tree | 8a456e37149a3cd12e5e8bb1a6484f8fd7ffec3d /init | |
| parent | 1eec89a671413ce38df9fe9e70f5130a9eb79a59 (diff) | |
| parent | 36569780b0d64de283f9d6c2195fd1a43e221ee8 (diff) | |
Merge branch 'tip/sched/urgent'
Avoid merge conflicts
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 4 | ||||
| -rw-r--r-- | init/initramfs.c | 1 | ||||
| -rw-r--r-- | init/main.c | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 6f4ec5633ffa..965699c0a6d9 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1719,9 +1719,13 @@ config FUTEX_PI depends on FUTEX && RT_MUTEXES default y +# +# marked broken for performance reasons; gives us one more cycle to sort things out. +# config FUTEX_PRIVATE_HASH bool depends on FUTEX && !BASE_SMALL && MMU + depends on BROKEN default y config FUTEX_MPOL diff --git a/init/initramfs.c b/init/initramfs.c index 72bad44a1d41..097673b97784 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/init.h> #include <linux/async.h> +#include <linux/export.h> #include <linux/fs.h> #include <linux/slab.h> #include <linux/types.h> diff --git a/init/main.c b/init/main.c index ed576c7f475d..225a58279acd 100644 --- a/init/main.c +++ b/init/main.c @@ -13,6 +13,7 @@ #define DEBUG /* Enable initcall_debug */ #include <linux/types.h> +#include <linux/export.h> #include <linux/extable.h> #include <linux/module.h> #include <linux/proc_fs.h> |