diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-29 14:28:08 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-29 14:28:08 -0400 |
| commit | b4093d6235b7e4249616651ee328600ced48a18a (patch) | |
| tree | 9f5b8e466e2d26fbe13ee7934f9e939a09815bd5 /kernel/timer.c | |
| parent | d9ab77161d811ffb0bccf396f7155cc905c1b9e1 (diff) | |
| parent | 7d3e91b8a1f5179d56a7412d4b499f2d5fc6b25d (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 0b36b9e5cc8b..a7f07d5a6241 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
| @@ -714,7 +714,7 @@ int mod_timer(struct timer_list *timer, unsigned long expires) | |||
| 714 | * networking code - if the timer is re-modified | 714 | * networking code - if the timer is re-modified |
| 715 | * to be the same thing then just return: | 715 | * to be the same thing then just return: |
| 716 | */ | 716 | */ |
| 717 | if (timer->expires == expires && timer_pending(timer)) | 717 | if (timer_pending(timer) && timer->expires == expires) |
| 718 | return 1; | 718 | return 1; |
| 719 | 719 | ||
| 720 | return __mod_timer(timer, expires, false, TIMER_NOT_PINNED); | 720 | return __mod_timer(timer, expires, false, TIMER_NOT_PINNED); |