diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-11-11 08:10:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-11-11 08:10:42 +0100 |
| commit | 367177e50189ab0a983b52f3d3f7eb2a1927db71 (patch) | |
| tree | fed5e93eb35d002e21cb3c2fafbfe38062aaa266 /kernel/time/timekeeping.c | |
| parent | c2bc11113c50449f23c40b724fe410fc2380a8e9 (diff) | |
| parent | d65670a78cdbfae94f20a9e05ec705871d7cdf2b (diff) | |
| download | op-kernel-dev-367177e50189ab0a983b52f3d3f7eb2a1927db71.zip op-kernel-dev-367177e50189ab0a983b52f3d3f7eb2a1927db71.tar.gz | |
Merge branch 'formingo/3.2/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core
Conflicts:
kernel/time/timekeeping.c
Diffstat (limited to 'kernel/time/timekeeping.c')
| -rw-r--r-- | kernel/time/timekeeping.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 025e136..e9f60d3 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -850,6 +850,13 @@ static void timekeeping_adjust(s64 offset) } else /* No adjustment needed */ return; + WARN_ONCE(timekeeper.clock->maxadj && + (timekeeper.mult + adj > timekeeper.clock->mult + + timekeeper.clock->maxadj), + "Adjusting %s more then 11%% (%ld vs %ld)\n", + timekeeper.clock->name, (long)timekeeper.mult + adj, + (long)timekeeper.clock->mult + + timekeeper.clock->maxadj); /* * So the following can be confusing. * |
