diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:26 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:26 -0400 |
| commit | 9a375e93f88269bb770fb2eaa57554c975449c88 (patch) | |
| tree | 4c8f6d77f0aa94fc69c5b9e75d51db1451bdf66f /arch/mips/kernel/time.c | |
| parent | b2b4b9a7c09ad66e095b13c97946a96f2dc8284e (diff) | |
| parent | acc696d93dcf993dec123d69d599979e1456ffec (diff) | |
Merge branch 'upstream' into max-sect
Diffstat (limited to 'arch/mips/kernel/time.c')
| -rw-r--r-- | arch/mips/kernel/time.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 5e51a2d8f3f0..13ff4da598cd 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c | |||
| @@ -116,8 +116,7 @@ static void c0_timer_ack(void) | |||
| 116 | write_c0_compare(expirelo); | 116 | write_c0_compare(expirelo); |
| 117 | 117 | ||
| 118 | /* Check to see if we have missed any timer interrupts. */ | 118 | /* Check to see if we have missed any timer interrupts. */ |
| 119 | count = read_c0_count(); | 119 | while (((count = read_c0_count()) - expirelo) < 0x7fffffff) { |
| 120 | if ((count - expirelo) < 0x7fffffff) { | ||
| 121 | /* missed_timer_count++; */ | 120 | /* missed_timer_count++; */ |
| 122 | expirelo = count + cycles_per_jiffy; | 121 | expirelo = count + cycles_per_jiffy; |
| 123 | write_c0_compare(expirelo); | 122 | write_c0_compare(expirelo); |