moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 4ac6d90867 ("Merge tag 'docs-5.15' of git://git.lwn.net/linux") into android-mainline

Browse Source 
Steps on the way to 5.15-rc1

Fixes merge conflicts in:
	scripts/Makefile.lib

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I12b5165860a212fb39c98504a0729f1bab52ab54
This commit is contained in:
Greg Kroah-Hartman
2021-09-07 18:53:12 +02:00
parent 7606f2120e 4ac6d90867
commit 3ca4e02658
870 changed files with 50938 additions and 12805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/trace/trace.c
View File

@@ -9840,7 +9840,6 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode)
tracing_off();
local_irq_save(flags);
printk_nmi_direct_enter();
/* Simulate the iterator */
trace_init_global_iter(&iter);
@@ -9930,7 +9929,6 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode)
atomic_dec(&per_cpu_ptr(iter.array_buffer->data, cpu)->disabled);
}
atomic_dec(&dump_running);
printk_nmi_direct_exit();
local_irq_restore(flags);
}
EXPORT_SYMBOL_GPL(ftrace_dump);