public inbox for kexec@lists.infradead.org
 help / color / mirror / Atom feed
* [RESEND PATCH] vmcore-dmesg: Understand >= v3.11-rc4 dmesg
@ 2013-09-18 12:21 Lubomir Rintel
  2013-09-19 14:38 ` Dave Young
  0 siblings, 1 reply; 16+ messages in thread
From: Lubomir Rintel @ 2013-09-18 12:21 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>
---

I believe this can now be applied, as the change went into 3.11 kernel release.
Thank you!

 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] 16+ messages in thread

end of thread, other threads:[~2014-05-22 13:51 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-18 12:21 [RESEND PATCH] vmcore-dmesg: Understand >= v3.11-rc4 dmesg Lubomir Rintel
2013-09-19 14:38 ` Dave Young
2013-09-19 14:49   ` [PATCH v2] " Lubomir Rintel
2013-09-20  1:50     ` Dave Young
2013-09-20  1:55       ` Joe Perches
2013-09-20  7:40         ` Dave Young
2013-09-23 17:03     ` Vivek Goyal
2013-10-30  3:12     ` WANG Chao
2013-10-30 17:06       ` Lubomir Rintel
2013-10-31  0:34         ` Taras Kondratiuk
2013-10-31  5:38         ` WANG Chao
2013-10-31  6:18           ` WANG Chao
2013-10-31  6:20           ` Simon Horman
2013-10-31 16:42             ` Taras Kondratiuk
2013-11-01  0:32               ` Simon Horman
2014-05-22 13:51               ` Vivek Goyal

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox