diff options
| author |   Petr Mladek <pmladek@suse.com> | 2021-06-29 09:51:45 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2021-06-29 09:51:45 +0200 |
| commit | 80ae552917228b97ca9f7df83f74ac306d6fd68f (patch) | |
| tree | 858aac1d82608e0caaaa994a8bf1b19dd5282f06 /kernel | |
| parent | printk: Remove trailing semicolon in macros (diff) | |
| parent | usb: host: xhci-tegra: Switch to use %ptTs (diff) | |
| download | linux-dev-80ae552917228b97ca9f7df83f74ac306d6fd68f.tar.xz linux-dev-80ae552917228b97ca9f7df83f74ac306d6fd68f.zip | |
Merge branch 'for-5.14-vsprintf-pts' into for-linus
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/debug/kdb/kdb_main.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c index 1baa96a2ecb8..622410c45da1 100644 --- a/kernel/debug/kdb/kdb_main.c +++ b/kernel/debug/kdb/kdb_main.c @@ -2488,7 +2488,6 @@ static void kdb_sysinfo(struct sysinfo *val) static int kdb_summary(int argc, const char **argv) { time64_t now; - struct tm tm; struct sysinfo val; if (argc) @@ -2502,13 +2501,7 @@ static int kdb_summary(int argc, const char **argv) kdb_printf("domainname %s\n", init_uts_ns.name.domainname); now = __ktime_get_real_seconds(); - time64_to_tm(now, 0, &tm); - kdb_printf("date %04ld-%02d-%02d %02d:%02d:%02d " - "tz_minuteswest %d\n", - 1900+tm.tm_year, tm.tm_mon+1, tm.tm_mday, - tm.tm_hour, tm.tm_min, tm.tm_sec, - sys_tz.tz_minuteswest); - + kdb_printf("date %ptTs tz_minuteswest %d\n", &now, sys_tz.tz_minuteswest); kdb_sysinfo(&val); kdb_printf("uptime "); if (val.uptime > (24*60*60)) { |