diff options
author | Greg KH <gregkh@suse.de> | 2005-09-12 21:45:04 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 21:45:04 +0200 |
commit | d58dde0f552a5c5c4485b962d8b6e9dd54fefb30 (patch) | |
tree | d9a7e35eb88fea6265d5aadcc3d4ed39122b052a /kernel/softirq.c | |
parent | [PATCH] crc16: remove w1 specific comments. (diff) | |
parent | [PATCH] x86-64: clean up local_add/sub arguments (diff) | |
download | linux-d58dde0f552a5c5c4485b962d8b6e9dd54fefb30.tar.xz linux-d58dde0f552a5c5c4485b962d8b6e9dd54fefb30.zip |
Merge ../torvalds-2.6/
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r-- | kernel/softirq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index b4ab6af1dea8..f766b2fc48be 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -84,7 +84,7 @@ asmlinkage void __do_softirq(void) cpu = smp_processor_id(); restart: /* Reset the pending bitmask before enabling irqs */ - local_softirq_pending() = 0; + set_softirq_pending(0); local_irq_enable(); |