Message ID | 20150511082343.31385.39300.stgit@hbathini.in.ibm.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On Mon, 2015-11-05 at 08:23:43 UTC, Hari Bathini wrote: > Pstore only supports one backend at a time. The preferred > pstore backend is set by passing the pstore.backend=<name> > argument to the kernel at boot time. Currently, while trying > to register with pstore, nvram throws an error message even > when "pstore.backend != nvram", which is unnecessary. This > patch removes the error message in case "pstore.backend != nvram". > > Signed-off-by: Hari Bathini <hbathini@linux.vnet.ibm.com> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/74943dab6b155b1a9d40 cheers
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c index 1e703f8..bfdbcab 100644 --- a/arch/powerpc/kernel/nvram_64.c +++ b/arch/powerpc/kernel/nvram_64.c @@ -582,9 +582,10 @@ static int nvram_pstore_init(void) spin_lock_init(&nvram_pstore_info.buf_lock); rc = pstore_register(&nvram_pstore_info); - if (rc != 0) - pr_err("nvram: pstore_register() failed, defaults to " - "kmsg_dump; returned %d\n", rc); + if (rc && (rc != -EPERM)) + /* Print error only when pstore.backend == nvram */ + pr_err("nvram: pstore_register() failed, returned %d. " + "Defaults to kmsg_dump\n", rc); return rc; }
Pstore only supports one backend at a time. The preferred pstore backend is set by passing the pstore.backend=<name> argument to the kernel at boot time. Currently, while trying to register with pstore, nvram throws an error message even when "pstore.backend != nvram", which is unnecessary. This patch removes the error message in case "pstore.backend != nvram". Signed-off-by: Hari Bathini <hbathini@linux.vnet.ibm.com> --- arch/powerpc/kernel/nvram_64.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)