Merge tag 'pstore-v5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux (c271bdbf) · Commits · 戴 / test

fs/pstore/inode.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -87,11 +87,11 @@ static void pstore_ftrace_seq_next(struct seq_file s, void v, loff_t pos)
		struct pstore_private *ps = s->private;
		struct pstore_ftrace_seq_data *data = v;

		(*pos)++;
		data->off += REC_SIZE;
		if (data->off + REC_SIZE > ps->total_size)
		return NULL;

		(*pos)++;
		return data;
		}

		@@ -101,6 +101,9 @@ static int pstore_ftrace_seq_show(struct seq_file s, void v)
		struct pstore_ftrace_seq_data *data = v;
		struct pstore_ftrace_record *rec;

		if (!data)
		return 0;

		rec = (struct pstore_ftrace_record *)(ps->record->buf + data->off);

		seq_printf(s, "CPU:%d ts:%llu %08lx %08lx %ps <- %pS\n",

+2 −2

Original line number	Diff line number	Diff line
		@@ -823,9 +823,9 @@ static int __init pstore_init(void)

		ret = pstore_init_fs();
		if (ret)
		return ret;
		free_buf_for_compression();

		return 0;
		return ret;
		}
		late_initcall(pstore_init);

+0 −1

Original line number	Diff line number	Diff line
		@@ -963,7 +963,6 @@ static void __init ramoops_register_dummy(void)
		pr_info("could not create platform device: %ld\n",
		PTR_ERR(dummy));
		dummy = NULL;
		ramoops_unregister_dummy();
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ struct persistent_ram_buffer {
		uint32_t sig;
		atomic_t start;
		atomic_t size;
		uint8_t data[0];
		uint8_t data[];
		};

		#define PERSISTENT_RAM_SIG (0x43474244) /* DBGC */