Messages in this thread | | | Date | Fri, 16 Mar 2012 10:18:02 +0200 | From | Adrian Hunter <> | Subject | Re: [Patch]Fix reason_str of pstore so that it can work correctly |
| |
On 07/03/12 23:17, Seiji Aguchi wrote: > Hi, > > Recently, there has been some changes in kmsg_dump() below. > (1) kmsg_dump(KMSG_DUMP_KEXEC) was removed. > http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=a3dd3323058d281abd584b15ad4c5b65064d7a61 > > (2) A order of "enum kmsg_dump_reason" was modified. > http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=c22ab332902333f83766017478c1ef6607ace681 > > These above patches modified kmsg_dump_reason in include/linux/kmsg_dump.h. > But reason_str in fs/pstore/platform.c was not modified. > > This patch just fixes reason_str in fs/pstore/platform.c so that pstore can work correctly. > > Signed-off-by: Seiji Aguchi <seiji.aguchi@hds.com> > > --- > fs/pstore/platform.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 9ec22d3..81f4748 100644 > --- a/fs/pstore/platform.c > +++ b/fs/pstore/platform.c > @@ -69,7 +69,7 @@ void pstore_set_kmsg_bytes(int bytes) > static int oopscount; > > static char *reason_str[] = { > - "Oops", "Panic", "Kexec", "Restart", "Halt", "Poweroff", "Emergency" > + "Panic", "Oops", "Emergency", "Restart", "Halt", "Poweroff" > };
It would be better to make it so it would not break e.g.
static const char *get_reason_str(enum kmsg_dump_reason reason) { switch (reason) { KMSG_DUMP_PANIC: return "Panic"; KMSG_DUMP_OOPS: return "Oops"; KMSG_DUMP_EMERG: return "Emergency"; KMSG_DUMP_RESTART: return "Restart"; KMSG_DUMP_HALT: return "Halt"; KMSG_DUMP_POWEROFF: return "Poweroff"; default: return "Unknown"; } }
| |