summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/linux/context_tracking.h2
-rw-r--r--kernel/context_tracking.c5
-rw-r--r--kernel/time/tick-sched.c6
3 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h
index d883ff0dd8fc..1ae37c708c63 100644
--- a/include/linux/context_tracking.h
+++ b/include/linux/context_tracking.h
@@ -34,6 +34,8 @@ static inline bool context_tracking_active(void)
return __this_cpu_read(context_tracking.active);
}
+extern void context_tracking_cpu_set(int cpu);
+
extern void user_enter(void);
extern void user_exit(void);
diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c
index 7b095de356c5..72bcb2570d3e 100644
--- a/kernel/context_tracking.c
+++ b/kernel/context_tracking.c
@@ -26,6 +26,11 @@ DEFINE_PER_CPU(struct context_tracking, context_tracking) = {
#endif
};
+void context_tracking_cpu_set(int cpu)
+{
+ per_cpu(context_tracking.active, cpu) = true;
+}
+
/**
* user_enter - Inform the context tracking that the CPU is going to
* enter userspace mode.
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 9563c744dad2..91a2528b5f44 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -23,6 +23,7 @@
#include <linux/irq_work.h>
#include <linux/posix-timers.h>
#include <linux/perf_event.h>
+#include <linux/context_tracking.h>
#include <asm/irq_regs.h>
@@ -344,11 +345,16 @@ static int tick_nohz_init_all(void)
void __init tick_nohz_init(void)
{
+ int cpu;
+
if (!have_nohz_full_mask) {
if (tick_nohz_init_all() < 0)
return;
}
+ for_each_cpu(cpu, nohz_full_mask)
+ context_tracking_cpu_set(cpu);
+
cpu_notifier(tick_nohz_cpu_down_callback, 0);
cpulist_scnprintf(nohz_full_buf, sizeof(nohz_full_buf), nohz_full_mask);
pr_info("NO_HZ: Full dynticks CPUs: %s.\n", nohz_full_buf);