Merge "tracing: Avoid sleep in atomic context" (b78ea39a) · Commits · e / devices / android_kernel_fairphone_FP3

kernel/trace/trace.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4678,7 +4678,7 @@ tracing_saved_tgids_read(struct file file, char __user ubuf,
		preempt_disable();
		arch_spin_lock(&trace_cmdline_lock);

		pids = kmalloc_array(savedcmd->cmdline_num, 2*sizeof(int), GFP_KERNEL);
		pids = kmalloc_array(savedcmd->cmdline_num, 2*sizeof(int), GFP_ATOMIC);
		if (!pids) {
		arch_spin_unlock(&trace_cmdline_lock);
		preempt_enable();