The following commit has been merged into the timers/core branch of tip: Commit-ID: ec02821c1d35f93b821bc9fdfa83a5f3e9d7275d Gitweb: https://git.kernel.org/tip/ec02821c1d35f93b821bc9fdfa83a5f3e9d7275d Author: Xu Wang <vulab@xxxxxxxxxxx> AuthorDate: Tue, 18 Aug 2020 06:26:51 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Tue, 25 Aug 2020 12:45:53 +02:00 alarmtimer: Convert comma to semicolon Replace a comma between expression statements by a semicolon. Signed-off-by: Xu Wang <vulab@xxxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Reviewed-by: Stephen Boyd <sboyd@xxxxxxxxxx> Link: https://lore.kernel.org/r/20200818062651.21680-1-vulab@xxxxxxxxxxx --- kernel/time/alarmtimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index ca223a8..f4ace1b 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -908,7 +908,7 @@ static int __init alarmtimer_init(void) /* Initialize alarm bases */ alarm_bases[ALARM_REALTIME].base_clockid = CLOCK_REALTIME; alarm_bases[ALARM_REALTIME].get_ktime = &ktime_get_real; - alarm_bases[ALARM_REALTIME].get_timespec = ktime_get_real_ts64, + alarm_bases[ALARM_REALTIME].get_timespec = ktime_get_real_ts64; alarm_bases[ALARM_BOOTTIME].base_clockid = CLOCK_BOOTTIME; alarm_bases[ALARM_BOOTTIME].get_ktime = &ktime_get_boottime; alarm_bases[ALARM_BOOTTIME].get_timespec = get_boottime_timespec;
|