* [PATCH] vmcore-dmesg: Understand >= v3.11-rc4 dmesg
@ 2013-09-01 19:12 Lubomir Rintel
2013-09-01 19:17 ` Joe Perches
0 siblings, 1 reply; 3+ messages in thread
From: Lubomir Rintel @ 2013-09-01 19:12 UTC (permalink / raw)
To: kexec; +Cc: Joe Perches, Lubomir Rintel, Simon Horman, Vivek Goyal
Symbol name changed with the following commit:
62e32ac printk: rename struct log to struct printk_log
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Cc: Simon Horman <horms@verge.net.au>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
vmcore-dmesg/vmcore-dmesg.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/vmcore-dmesg/vmcore-dmesg.c b/vmcore-dmesg/vmcore-dmesg.c
index 0f477c0..bfc19e9 100644
--- a/vmcore-dmesg/vmcore-dmesg.c
+++ b/vmcore-dmesg/vmcore-dmesg.c
@@ -324,19 +324,27 @@ static void scan_vmcoreinfo(char *start, size_t size)
*symbol[i].vaddr = vaddr;
}
- /* Check for "SIZE(log)=" */
+ /* Check for "SIZE(printk_log)" or older "SIZE(log)=" */
if (memcmp("SIZE(log)=", pos, 10) == 0)
log_sz = strtoull(pos + 10, NULL, 10);
+ if (memcmp("SIZE(printk_log)=", pos, 17) == 0)
+ log_sz = strtoull(pos + 17, NULL, 10);
/* Check for struct log field offsets */
if (memcmp("OFFSET(log.ts_nsec)=", pos, 20) == 0)
log_offset_ts_nsec = strtoull(pos + 20, NULL, 10);
+ if (memcmp("OFFSET(printk_log.ts_nsec)=", pos, 27) == 0)
+ log_offset_ts_nsec = strtoull(pos + 27, NULL, 10);
if (memcmp("OFFSET(log.len)=", pos, 16) == 0)
log_offset_len = strtoul(pos + 16, NULL, 10);
+ if (memcmp("OFFSET(printk_log.len)=", pos, 23) == 0)
+ log_offset_len = strtoul(pos + 23, NULL, 10);
if (memcmp("OFFSET(log.text_len)=", pos, 21) == 0)
log_offset_text_len = strtoul(pos + 21, NULL, 10);
+ if (memcmp("OFFSET(printk_log.text_len)=", pos, 28) == 0)
+ log_offset_text_len = strtoul(pos + 28, NULL, 10);
if (last_line)
break;
--
1.7.1
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] vmcore-dmesg: Understand >= v3.11-rc4 dmesg
2013-09-01 19:12 [PATCH] vmcore-dmesg: Understand >= v3.11-rc4 dmesg Lubomir Rintel
@ 2013-09-01 19:17 ` Joe Perches
2013-09-01 20:13 ` Lubomir Rintel
0 siblings, 1 reply; 3+ messages in thread
From: Joe Perches @ 2013-09-01 19:17 UTC (permalink / raw)
To: Lubomir Rintel; +Cc: Simon Horman, kexec, Vivek Goyal
On Sun, 2013-09-01 at 21:12 +0200, Lubomir Rintel wrote:
> Symbol name changed with the following commit:
> 62e32ac printk: rename struct log to struct printk_log
Thanks, I figured it would change/break something somewhere
but I had no idea where.
cheers, Joe
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] vmcore-dmesg: Understand >= v3.11-rc4 dmesg
2013-09-01 19:17 ` Joe Perches
@ 2013-09-01 20:13 ` Lubomir Rintel
0 siblings, 0 replies; 3+ messages in thread
From: Lubomir Rintel @ 2013-09-01 20:13 UTC (permalink / raw)
To: Joe Perches; +Cc: Simon Horman, kexec, Vivek Goyal
On Sunday, September 1, 2013 9:17:50 PM, Joe Perches wrote:
> On Sun, 2013-09-01 at 21:12 +0200, Lubomir Rintel wrote:
> > Symbol name changed with the following commit:
> > 62e32ac printk: rename struct log to struct printk_log
>
> Thanks, I figured it would change/break something somewhere
> but I had no idea where.
I thought it was intentional. Other change where this broke was makedumpimage, see another patch I've sent to the list a short while ago and Cc'd to you.
In case the changes are going to be backed off please disregard those patches.
Thank you!
Lubo
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-01 20:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-01 19:12 [PATCH] vmcore-dmesg: Understand >= v3.11-rc4 dmesg Lubomir Rintel
2013-09-01 19:17 ` Joe Perches
2013-09-01 20:13 ` Lubomir Rintel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox