Commit 80ae5529 authored by Petr Mladek's avatar Petr Mladek
Browse files

Merge branch 'for-5.14-vsprintf-pts' into for-linus

parents 4249cb7d 2f9e0f8c

Documentation/core-api/printk-formats.rst

+6 −1
Original line number Diff line number Diff line
@@ -514,9 +514,10 @@ Time and date 
::



	%pt[RT]			YYYY-mm-ddTHH:MM:SS

	%pt[RT]s		YYYY-mm-dd HH:MM:SS

	%pt[RT]d		YYYY-mm-dd

	%pt[RT]t		HH:MM:SS

	%pt[RT][dt][r]

	%pt[RT][dt][r][s]



For printing date and time as represented by::
@@ -528,6 +529,10 @@ in human readable format. 
By default year will be incremented by 1900 and month by 1.

Use %pt[RT]r (raw) to suppress this behaviour.



The %pt[RT]s (space) will override ISO 8601 separator by using ' ' (space)

instead of 'T' (Capital T) between date and time. It won't have any effect

when date or time is omitted.



Passed by reference.



struct clk

drivers/usb/host/xhci-tegra.c

+1 −5
Original line number Diff line number Diff line
@@ -917,7 +917,6 @@ static int tegra_xusb_load_firmware(struct tegra_xusb *tegra) 
	struct xhci_op_regs __iomem *op;

	unsigned long timeout;

	time64_t timestamp;

	struct tm time;

	u64 address;

	u32 value;

	int err;
@@ -1014,11 +1013,8 @@ static int tegra_xusb_load_firmware(struct tegra_xusb *tegra) 
	}



	timestamp = le32_to_cpu(header->fwimg_created_time);

	time64_to_tm(timestamp, 0, &time);



	dev_info(dev, "Firmware timestamp: %ld-%02d-%02d %02d:%02d:%02d UTC\n",

		 time.tm_year + 1900, time.tm_mon + 1, time.tm_mday,

		 time.tm_hour, time.tm_min, time.tm_sec);

	dev_info(dev, "Firmware timestamp: %ptTs UTC\n", &timestamp);



	return 0;

}

fs/nilfs2/sysfs.c

+3 −16
Original line number Diff line number Diff line
@@ -19,19 +19,6 @@ 
/* /sys/fs/<nilfs>/ */

static struct kset *nilfs_kset;



#define NILFS_SHOW_TIME(time_t_val, buf) ({ \

		struct tm res; \

		int count = 0; \

		time64_to_tm(time_t_val, 0, &res); \

		res.tm_year += 1900; \

		res.tm_mon += 1; \

		count = scnprintf(buf, PAGE_SIZE, \

				    "%ld-%.2d-%.2d %.2d:%.2d:%.2d\n", \

				    res.tm_year, res.tm_mon, res.tm_mday, \

				    res.tm_hour, res.tm_min, res.tm_sec);\

		count; \

})



#define NILFS_DEV_INT_GROUP_OPS(name, parent_name) \

static ssize_t nilfs_##name##_attr_show(struct kobject *kobj, \

					struct attribute *attr, char *buf) \
@@ -576,7 +563,7 @@ nilfs_segctor_last_seg_write_time_show(struct nilfs_segctor_attr *attr, 
	ctime = nilfs->ns_ctime;

	up_read(&nilfs->ns_segctor_sem);



	return NILFS_SHOW_TIME(ctime, buf);

	return sysfs_emit(buf, "%ptTs\n", &ctime);

}



static ssize_t
@@ -604,7 +591,7 @@ nilfs_segctor_last_nongc_write_time_show(struct nilfs_segctor_attr *attr, 
	nongc_ctime = nilfs->ns_nongc_ctime;

	up_read(&nilfs->ns_segctor_sem);



	return NILFS_SHOW_TIME(nongc_ctime, buf);

	return sysfs_emit(buf, "%ptTs\n", &nongc_ctime);

}



static ssize_t
@@ -724,7 +711,7 @@ nilfs_superblock_sb_write_time_show(struct nilfs_superblock_attr *attr, 
	sbwtime = nilfs->ns_sbwtime;

	up_read(&nilfs->ns_sem);



	return NILFS_SHOW_TIME(sbwtime, buf);

	return sysfs_emit(buf, "%ptTs\n", &sbwtime);

}



static ssize_t

kernel/debug/kdb/kdb_main.c

+1 −8
Original line number Diff line number Diff line
@@ -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)) {

lib/test_printf.c

+5 −0
Original line number Diff line number Diff line
@@ -528,6 +528,11 @@ time_and_date(void) 
	test("0119-00-04T15:32:23", "%ptTr", &t);

	test("15:32:23|2019-01-04", "%ptTt|%ptTd", &t, &t);

	test("15:32:23|0119-00-04", "%ptTtr|%ptTdr", &t, &t);



	test("2019-01-04 15:32:23", "%ptTs", &t);

	test("0119-00-04 15:32:23", "%ptTsr", &t);

	test("15:32:23|2019-01-04", "%ptTts|%ptTds", &t, &t);

	test("15:32:23|0119-00-04", "%ptTtrs|%ptTdrs", &t, &t);

}



static void __init