Complete the housekeeping split from CONFIG_NO_HZ_FULL by moving it
under its own config. This way we finally separate the isolation code
from nohz.
Signed-off-by: Frederic Weisbecker <fweis...@gmail.com>
Cc: Chris Metcalf <cmetc...@mellanox.com>
Cc: Rik van Riel <r...@redhat.com>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Mike Galbraith <efa...@gmx.de>
Cc: Ingo Molnar <mi...@kernel.org>
Cc: Christoph Lameter <c...@linux.com>
Cc: Paul E. McKenney <paul...@linux.vnet.ibm.com>
Cc: Wanpeng Li <kernel...@gmail.com>
Cc: Luiz Capitulino <lcapitul...@redhat.com>
---
include/linux/housekeeping.h | 6 +++---
init/Kconfig | 6 ++++++
kernel/Makefile | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/include/linux/housekeeping.h b/include/linux/housekeeping.h
index ba769c8..d79a665 100644
--- a/include/linux/housekeeping.h
+++ b/include/linux/housekeeping.h
@@ -5,7 +5,7 @@
#include <linux/init.h>
#include <linux/tick.h>
-#ifdef CONFIG_NO_HZ_FULL
+#ifdef CONFIG_HOUSEKEEPING
DECLARE_STATIC_KEY_FALSE(housekeeping_overriden);
extern int housekeeping_any_cpu(void);
extern const struct cpumask *housekeeping_cpumask(void);
@@ -25,11 +25,11 @@ static inline const struct cpumask
*housekeeping_cpumask(void)
}
static inline void housekeeping_affine(struct task_struct *t) { }
-#endif /* CONFIG_NO_HZ_FULL */
+#endif /* CONFIG_HOUSEKEEPING */
static inline bool housekeeping_cpu(int cpu)
{
-#ifdef CONFIG_NO_HZ_FULL
+#ifdef CONFIG_HOUSEKEEPING
if (static_branch_unlikely(&housekeeping_overriden))
return housekeeping_test_cpu(cpu);
#endif
diff --git a/init/Kconfig b/init/Kconfig
index 8514b25..cc7af32 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -472,6 +472,12 @@ config TASK_IO_ACCOUNTING
endmenu # "CPU/Task time and stats accounting"
+config HOUSEKEEPING
+ bool "Housekeeping work tuning"
+ help
+ Allow to affine and offload kernel internal routine jobs that are
+ usually executed on any CPU.
+
source "kernel/rcu/Kconfig"
config BUILD_BIN2C
diff --git a/kernel/Makefile b/kernel/Makefile
index 8a85c4b..58be459 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -109,7 +109,7 @@ obj-$(CONFIG_JUMP_LABEL) += jump_label.o
obj-$(CONFIG_CONTEXT_TRACKING) += context_tracking.o
obj-$(CONFIG_TORTURE_TEST) += torture.o
obj-$(CONFIG_MEMBARRIER) += membarrier.o
-obj-$(CONFIG_NO_HZ_FULL) += housekeeping.o
+obj-$(CONFIG_HOUSEKEEPING) += housekeeping.o
obj-$(CONFIG_HAS_IOMEM) += memremap.o
--
2.7.4
