Commit 22b8f9ee authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras

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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 9acd57ca
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define TRACE_ENABLE_INTS bl .trace_hardirqs_on #define TRACE_ENABLE_INTS bl .trace_hardirqs_on
#define TRACE_DISABLE_INTS bl .trace_hardirqs_off #define TRACE_DISABLE_INTS bl .trace_hardirqs_off
#define TRACE_AND_RESTORE_IRQ_PARTIAL(en,skip) \ #define TRACE_AND_RESTORE_IRQ_PARTIAL(en,skip) \
cmpdi en, 0; \ cmpdi en,0; \
bne 95f; \ bne 95f; \
stb en,PACASOFTIRQEN(r13); \ stb en,PACASOFTIRQEN(r13); \
bl .trace_hardirqs_off; \ bl .trace_hardirqs_off; \
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
li en,1; li en,1;
#define TRACE_AND_RESTORE_IRQ(en) \ #define TRACE_AND_RESTORE_IRQ(en) \
TRACE_AND_RESTORE_IRQ_PARTIAL(en,96f); \ TRACE_AND_RESTORE_IRQ_PARTIAL(en,96f); \
96: stb en,PACASOFTIRQEN(r13) stb en,PACASOFTIRQEN(r13); \
96:
#else #else
#define TRACE_ENABLE_INTS #define TRACE_ENABLE_INTS
#define TRACE_DISABLE_INTS #define TRACE_DISABLE_INTS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment