Skip to content

Commit

Permalink
Merge tag 'timers-urgent-2020-06-28' of git://git.kernel.org/pub/scm/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
torvalds committed Jun 28, 2020
2 parents ae71d4b + f097eb3 commit 668f532
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions include/linux/timekeeping.h
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,9 @@ extern bool timekeeping_rtc_skipresume(void);

extern void timekeeping_inject_sleeptime64(const struct timespec64 *delta);

/*
/**
* struct system_time_snapshot - simultaneous raw/real time capture with
* counter value
* counter value
* @cycles: Clocksource counter value to produce the system times
* @real: Realtime system time
* @raw: Monotonic raw system time
Expand All @@ -239,9 +239,9 @@ struct system_time_snapshot {
u8 cs_was_changed_seq;
};

/*
/**
* struct system_device_crosststamp - system/device cross-timestamp
* (syncronized capture)
* (synchronized capture)
* @device: Device time
* @sys_realtime: Realtime simultaneous with device time
* @sys_monoraw: Monotonic raw simultaneous with device time
Expand All @@ -252,12 +252,12 @@ struct system_device_crosststamp {
ktime_t sys_monoraw;
};

/*
/**
* struct system_counterval_t - system counter value with the pointer to the
* corresponding clocksource
* corresponding clocksource
* @cycles: System counter value
* @cs: Clocksource corresponding to system counter value. Used by
* timekeeping code to verify comparibility of two cycle values
* timekeeping code to verify comparibility of two cycle values
*/
struct system_counterval_t {
u64 cycles;
Expand Down

0 comments on commit 668f532

Please sign in to comment.