Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit ca7e716c7833aeaeb8fedd6d004c5f5d5e14d325

Authored by Linus Torvalds
1 parent 5279585ff2
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

Revert "sched_clock: prevent scd->clock from moving backwards" 

This reverts commit 5b7dba4ff834259a5623e03a565748704a8fe449, which
caused a regression in hibernate, reported by and bisected by Fabio
Comolli.

This revert fixes

 http://bugzilla.kernel.org/show_bug.cgi?id=12155
 http://bugzilla.kernel.org/show_bug.cgi?id=12149

Bisected-by: Fabio Comolli <fabio.comolli@gmail.com>
Requested-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

kernel/sched_clock.c
Diff comments   View file @ ca7e716
... ... @@ -118,13 +118,13 @@
118 118  
119 119 /*
120 120 * scd->clock = clamp(scd->tick_gtod + delta,
121   - * max(scd->tick_gtod, scd->clock),
122   - * max(scd->clock, scd->tick_gtod + TICK_NSEC));
  121 + * max(scd->tick_gtod, scd->clock),
  122 + * scd->tick_gtod + TICK_NSEC);
123 123 */
124 124  
125 125 clock = scd->tick_gtod + delta;
126 126 min_clock = wrap_max(scd->tick_gtod, scd->clock);
127   - max_clock = wrap_max(scd->clock, scd->tick_gtod + TICK_NSEC);
  127 + max_clock = scd->tick_gtod + TICK_NSEC;
128 128  
129 129 clock = wrap_max(clock, min_clock);
130 130 clock = wrap_min(clock, max_clock);