diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-02 16:54:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-02 16:54:00 -0500 |
| commit | e2160156bf2a7d5018e99a9993fbcdda0abac09b (patch) | |
| tree | 1a70cb13dcfa7ade4c48d8a64d20543abebfb1dc /kernel/trace | |
| parent | 62e13097c46c69dbd7544ab2cd585ccf48f360a4 (diff) | |
| parent | 6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff) | |
| download | linux-e2160156bf2a7d5018e99a9993fbcdda0abac09b.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_hwlat.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel/trace/trace_hwlat.c b/kernel/trace/trace_hwlat.c index 775569ec50d0..af344a1bf0d0 100644 --- a/kernel/trace/trace_hwlat.c +++ b/kernel/trace/trace_hwlat.c @@ -266,7 +266,7 @@ out: static struct cpumask save_cpumask; static bool disable_migrate; -static void move_to_next_cpu(void) +static void move_to_next_cpu(bool initmask) { static struct cpumask *current_mask; int next_cpu; @@ -275,7 +275,7 @@ static void move_to_next_cpu(void) return; /* Just pick the first CPU on first iteration */ - if (!current_mask) { + if (initmask) { current_mask = &save_cpumask; get_online_cpus(); cpumask_and(current_mask, cpu_online_mask, tracing_buffer_mask); @@ -330,10 +330,12 @@ static void move_to_next_cpu(void) static int kthread_fn(void *data) { u64 interval; + bool initmask = true; while (!kthread_should_stop()) { - move_to_next_cpu(); + move_to_next_cpu(initmask); + initmask = false; local_irq_disable(); get_sample(); |