diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-14 23:10:00 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-14 23:10:00 -0400 |
| commit | 4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 (patch) | |
| tree | 07aea7539f78f221c6fc535a94a07befa2afdb63 /kernel/softirq.c | |
| parent | f241be74b803dcf9d70c9978292946370654320f (diff) | |
| parent | 2ba84684e8cf6f980e4e95a2300f53a505eb794e (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'kernel/softirq.c')
| -rw-r--r-- | kernel/softirq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 31007d6542cc..b4ab6af1dea8 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c | |||
| @@ -86,7 +86,7 @@ restart: | |||
| 86 | /* Reset the pending bitmask before enabling irqs */ | 86 | /* Reset the pending bitmask before enabling irqs */ |
| 87 | local_softirq_pending() = 0; | 87 | local_softirq_pending() = 0; |
| 88 | 88 | ||
| 89 | //local_irq_enable(); | 89 | local_irq_enable(); |
| 90 | 90 | ||
| 91 | h = softirq_vec; | 91 | h = softirq_vec; |
| 92 | 92 | ||
| @@ -99,7 +99,7 @@ restart: | |||
| 99 | pending >>= 1; | 99 | pending >>= 1; |
| 100 | } while (pending); | 100 | } while (pending); |
| 101 | 101 | ||
| 102 | //local_irq_disable(); | 102 | local_irq_disable(); |
| 103 | 103 | ||
| 104 | pending = local_softirq_pending(); | 104 | pending = local_softirq_pending(); |
| 105 | if (pending && --max_restart) | 105 | if (pending && --max_restart) |