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

Download as
Browse Code ยป

Commit a115d5caca1a2905ba7a32b408a6042b20179aaa

Authored by Ingo Molnar
Committed by Linus Torvalds
1 parent a3b13c23f1
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

fix the softlockup watchdog to actually work 

this Xen related commit:

   commit 966812dc98e6a7fcdf759cbfa0efab77500a8868
   Author: Jeremy Fitzhardinge <jeremy@goop.org>
   Date:   Tue May 8 00:28:02 2007 -0700

       Ignore stolen time in the softlockup watchdog

broke the softlockup watchdog to never report any lockups. (!)

print_timestamp defaults to 0, this makes the following condition
always true:

	if (print_timestamp < (touch_timestamp + 1) ||

and we'll in essence never report soft lockups.

apparently the functionality of the soft lockup watchdog was never
actually tested with that patch applied ...

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

... ... @@ -82,10 +82,11 @@
82 82 print_timestamp = per_cpu(print_timestamp, this_cpu);
83 83  
84 84 /* report at most once a second */
85   - if (print_timestamp < (touch_timestamp + 1) ||
86   - did_panic ||
87   - !per_cpu(watchdog_task, this_cpu))
  85 + if ((print_timestamp >= touch_timestamp &&
  86 + print_timestamp < (touch_timestamp + 1)) ||
  87 + did_panic || !per_cpu(watchdog_task, this_cpu)) {
88 88 return;
  89 + }
89 90  
90 91 /* do not print during early bootup: */
91 92 if (unlikely(system_state != SYSTEM_RUNNING)) {