3 files changed, 24 insertions, 2 deletions

diff --git a/init/Kconfig b/init/Kconfig
index d96127ebc44e..ec1021fd3371 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -931,6 +931,28 @@ config RT_GROUP_SCHED
 
 endif #CGROUP_SCHED
 
+config UCLAMP_TASK_GROUP
+        bool "Utilization clamping per group of tasks"
+        depends on CGROUP_SCHED
+        depends on UCLAMP_TASK
+        default n
+        help
+          This feature enables the scheduler to track the clamped utilization
+          of each CPU based on RUNNABLE tasks currently scheduled on that CPU.
+
+          When this option is enabled, the user can specify a min and max
+          CPU bandwidth which is allowed for each single task in a group.
+          The max bandwidth allows to clamp the maximum frequency a task
+          can use, while the min bandwidth allows to define a minimum
+          frequency a task will always use.
+
+          When task group based utilization clamping is enabled, an eventually
+          specified task-specific clamp value is constrained by the cgroup
+          specified clamp value. Both minimum and maximum task clamping cannot
+          be bigger than the corresponding clamping defined at task group level.
+
+          If in doubt, say N.
+
 config CGROUP_PIDS
         bool "PIDs controller"
         help
diff --git a/init/init_task.c b/init/init_task.c
index 7ab773b9b3cd..bfe06c53b14e 100644
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -174,7 +174,7 @@ struct task_struct init_task
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
         .ret_stack      = NULL,
 #endif
-#if defined(CONFIG_TRACING) && defined(CONFIG_PREEMPT)
+#if defined(CONFIG_TRACING) && defined(CONFIG_PREEMPTION)
         .trace_recursion = 0,
 #endif
 #ifdef CONFIG_LIVEPATCH
diff --git a/init/main.c b/init/main.c
index 96f8d5af52d6..653693da8da6 100644
--- a/init/main.c
+++ b/init/main.c
@@ -433,7 +433,7 @@ noinline void __ref rest_init(void)
 
         /*
          * Enable might_sleep() and smp_processor_id() checks.
-         * They cannot be enabled earlier because with CONFIG_PREEMPT=y
+         * They cannot be enabled earlier because with CONFIG_PREEMPTION=y
          * kernel_thread() would trigger might_sleep() splats. With
          * CONFIG_PREEMPT_VOLUNTARY=y the init task might have scheduled
          * already, but it's stuck on the kthreadd_done completion.