Commit 668f532d authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'timers-urgent-2020-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Ingo Molnar:
 "A single DocBook fix"

* tag 'timers-urgent-2020-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping: Fix kerneldoc system_device_crosststamp & al
parents ae71d4bf f097eb38
...@@ -222,7 +222,7 @@ extern bool timekeeping_rtc_skipresume(void); ...@@ -222,7 +222,7 @@ extern bool timekeeping_rtc_skipresume(void);
extern void timekeeping_inject_sleeptime64(const struct timespec64 *delta); extern void timekeeping_inject_sleeptime64(const struct timespec64 *delta);
/* /**
* struct system_time_snapshot - simultaneous raw/real time capture with * struct system_time_snapshot - simultaneous raw/real time capture with
* counter value * counter value
* @cycles: Clocksource counter value to produce the system times * @cycles: Clocksource counter value to produce the system times
...@@ -239,9 +239,9 @@ struct system_time_snapshot { ...@@ -239,9 +239,9 @@ struct system_time_snapshot {
u8 cs_was_changed_seq; u8 cs_was_changed_seq;
}; };
/* /**
* struct system_device_crosststamp - system/device cross-timestamp * struct system_device_crosststamp - system/device cross-timestamp
* (syncronized capture) * (synchronized capture)
* @device: Device time * @device: Device time
* @sys_realtime: Realtime simultaneous with device time * @sys_realtime: Realtime simultaneous with device time
* @sys_monoraw: Monotonic raw simultaneous with device time * @sys_monoraw: Monotonic raw simultaneous with device time
...@@ -252,7 +252,7 @@ struct system_device_crosststamp { ...@@ -252,7 +252,7 @@ struct system_device_crosststamp {
ktime_t sys_monoraw; ktime_t sys_monoraw;
}; };
/* /**
* struct system_counterval_t - system counter value with the pointer to the * struct system_counterval_t - system counter value with the pointer to the
* corresponding clocksource * corresponding clocksource
* @cycles: System counter value * @cycles: System counter value
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment