git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'fixes' and 'ioremap' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
entry-armv.S
diff --git
a/arch/arm/kernel/entry-armv.S
b/arch/arm/kernel/entry-armv.S
index
f8f7398
..
7335fc6
100644
(file)
--- a/
arch/arm/kernel/entry-armv.S
+++ b/
arch/arm/kernel/entry-armv.S
@@
-408,7
+408,7
@@
ENDPROC(__fiq_abt)
zero_fp
.if \trace
-#ifdef CONFIG_
IRQSOFF_TRACER
+#ifdef CONFIG_
TRACE_IRQFLAGS
bl trace_hardirqs_off
#endif
ct_user_exit save = 0