diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-08-15 17:11:31 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-08-18 14:22:34 +1000 |
| commit | 22b8f9ee4a91638a4c8f57e957a91cf49788332a (patch) | |
| tree | e2e7a467f4a7f59dc8559084b0432be19b73e858 /arch | |
| parent | 9acd57ca74b12bc8ba8da12c72b19ede2cddcb53 (diff) | |
| download | talos-op-linux-22b8f9ee4a91638a4c8f57e957a91cf49788332a.tar.gz talos-op-linux-22b8f9ee4a91638a4c8f57e957a91cf49788332a.zip | |
powerpc: Fix lockdep IRQ tracing bug
A small bogon sneaked into the ppc64 lockdep support. A test is
branching slightly off causing a clobbered register value to
overwrite the irq state under some circumstances.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/include/asm/irqflags.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/irqflags.h b/arch/powerpc/include/asm/irqflags.h index 17ba3a881bfd..5f68ecfdf516 100644 --- a/arch/powerpc/include/asm/irqflags.h +++ b/arch/powerpc/include/asm/irqflags.h @@ -20,7 +20,7 @@ #define TRACE_ENABLE_INTS bl .trace_hardirqs_on #define TRACE_DISABLE_INTS bl .trace_hardirqs_off #define TRACE_AND_RESTORE_IRQ_PARTIAL(en,skip) \ - cmpdi en, 0; \ + cmpdi en,0; \ bne 95f; \ stb en,PACASOFTIRQEN(r13); \ bl .trace_hardirqs_off; \ @@ -29,7 +29,8 @@ li en,1; #define TRACE_AND_RESTORE_IRQ(en) \ TRACE_AND_RESTORE_IRQ_PARTIAL(en,96f); \ -96: stb en,PACASOFTIRQEN(r13) + stb en,PACASOFTIRQEN(r13); \ +96: #else #define TRACE_ENABLE_INTS #define TRACE_DISABLE_INTS |
