Remove XXX_FROZEN state from trace/ring_buffer. Signed-off-by: Chen, Gong <gong.c...@linux.intel.com> --- kernel/trace/ring_buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index ff70271..1cd5793 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -4607,9 +4607,8 @@ static int rb_cpu_notify(struct notifier_block *self, int cpu_i, nr_pages_same; unsigned int nr_pages; - switch (action) { + switch (action & ~CPU_TASKS_FROZEN) { case CPU_UP_PREPARE: - case CPU_UP_PREPARE_FROZEN: if (cpumask_test_cpu(cpu, buffer->cpumask)) return NOTIFY_OK; @@ -4639,7 +4638,6 @@ static int rb_cpu_notify(struct notifier_block *self, cpumask_set_cpu(cpu, buffer->cpumask); break; case CPU_DOWN_PREPARE: - case CPU_DOWN_PREPARE_FROZEN: /* * Do nothing. * If we were to free the buffer, then the user would -- 2.0.0.rc2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/