diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2024-10-02 17:11:56 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2024-10-02 17:11:56 +0200 |
| commit | b98b27687352476d1688d292cafc1427a5258a59 (patch) | |
| tree | 68cfca90717672c63389cf35376a6f082ce04351 /include/linux | |
| parent | 6fadb4a61d3fd4cdc6ede38a911b4abbfb43eed4 (diff) | |
| parent | 8102c4daf44ab86c2d2226a8136bec905d6e2bd1 (diff) | |
Merge branch 'timers/kvm' into timers/core
Bring in the update which is provided to arm64/kvm so subsequent
timekeeping work does not conflict.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/timekeeping.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h index fc12a9ba2c88..e85c27347e44 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -275,6 +275,7 @@ struct ktime_timestamps { * counter value * @cycles: Clocksource counter value to produce the system times * @real: Realtime system time + * @boot: Boot time * @raw: Monotonic raw system time * @cs_id: Clocksource ID * @clock_was_set_seq: The sequence number of clock-was-set events @@ -283,6 +284,7 @@ struct ktime_timestamps { struct system_time_snapshot { u64 cycles; ktime_t real; + ktime_t boot; ktime_t raw; enum clocksource_ids cs_id; unsigned int clock_was_set_seq; |