diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:07:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-26 15:07:02 +0100 |
| commit | 6c869e772c72d509d0db243a56c205ef48a29baf (patch) | |
| tree | 9a290f1742526a8816f94560cb09bc0a09c910de /kernel/irq_work.c | |
| parent | Merge commit 'v2.6.37-rc3' into perf/core (diff) | |
| parent | perf: Fix the software context switch counter (diff) | |
| download | linux-dev-6c869e772c72d509d0db243a56c205ef48a29baf.tar.xz linux-dev-6c869e772c72d509d0db243a56c205ef48a29baf.zip | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
arch/x86/kernel/apic/hw_nmi.c
Merge reason: Resolve conflict, queue up dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/irq_work.c')
| -rw-r--r-- | kernel/irq_work.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/irq_work.c b/kernel/irq_work.c index f16763ff8481..90f881904bb1 100644 --- a/kernel/irq_work.c +++ b/kernel/irq_work.c @@ -145,7 +145,9 @@ void irq_work_run(void) * Clear the BUSY bit and return to the free state if * no-one else claimed it meanwhile. */ - cmpxchg(&entry->next, next_flags(NULL, IRQ_WORK_BUSY), NULL); + (void)cmpxchg(&entry->next, + next_flags(NULL, IRQ_WORK_BUSY), + NULL); } } EXPORT_SYMBOL_GPL(irq_work_run); |