diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-12-22 23:05:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 09:53:21 +0100 |
| commit | 1c5745aa380efb6417b5681104b007c8612fb496 (patch) | |
| tree | 263b81742f7973c0dd86efe414a79a324c0769e4 /include/linux/time.h | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
| download | kernel-crypto-1c5745aa380efb6417b5681104b007c8612fb496.tar.gz kernel-crypto-1c5745aa380efb6417b5681104b007c8612fb496.tar.xz kernel-crypto-1c5745aa380efb6417b5681104b007c8612fb496.zip | |
sched_clock: prevent scd->clock from moving backwards, take #2
Redo:
5b7dba4: sched_clock: prevent scd->clock from moving backwards
which had to be reverted due to s2ram hangs:
ca7e716: Revert "sched_clock: prevent scd->clock from moving backwards"
... this time with resume restoring GTOD later in the sequence
taken into account as well.
The "timekeeping_suspended" flag is not very nice but we cannot call into
GTOD before it has been properly resumed and the scheduler will run very
early in the resume sequence.
Cc: <stable@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/time.h')
| -rw-r--r-- | include/linux/time.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index ce321ac5c8f..fbbd2a1c92b 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -105,6 +105,7 @@ extern unsigned long read_persistent_clock(void); extern int update_persistent_clock(struct timespec now); extern int no_sync_cmos_clock __read_mostly; void timekeeping_init(void); +extern int timekeeping_suspended; unsigned long get_seconds(void); struct timespec current_kernel_time(void); |