Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'pstore-v4.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull pstore fix from Kees Cook:
"Fix pstore regression (boot Oops) when ftrace disabled, from Brian
Norris"
* tag 'pstore-v4.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
pstore: don't OOPS when there are no ftrace zones
+1
-1
+1
-1
fs/pstore/ram.c
+1
-1
fs/pstore/ram.c
···
280
280
1, id, type, PSTORE_TYPE_PMSG, 0);
281
281
282
282
/* ftrace is last since it may want to dynamically allocate memory. */
283
-
if (!prz_ok(prz)) {
283
+
if (!prz_ok(prz) && cxt->fprzs) {
284
284
if (!(cxt->flags & RAMOOPS_FLAG_FTRACE_PER_CPU)) {
285
285
prz = ramoops_get_next_prz(cxt->fprzs,
286
286
&cxt->ftrace_read_cnt, 1, id, type,