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 git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
entry64.S
diff --git
a/arch/s390/kernel/entry64.S
b/arch/s390/kernel/entry64.S
index
f6618e9
..
009ca61
100644
(file)
--- a/
arch/s390/kernel/entry64.S
+++ b/
arch/s390/kernel/entry64.S
@@
-284,10
+284,12
@@
sysc_leave:
sysc_done:
#ifdef CONFIG_TRACE_IRQFLAGS
sysc_done:
#ifdef CONFIG_TRACE_IRQFLAGS
+ .section .data,"aw",@progbits
.align 8
.globl sysc_restore_trace_psw
sysc_restore_trace_psw:
.quad 0, sysc_restore_trace
.align 8
.globl sysc_restore_trace_psw
sysc_restore_trace_psw:
.quad 0, sysc_restore_trace
+ .previous
#endif
#
#endif
#
@@
-595,10
+597,12
@@
io_leave:
io_done:
#ifdef CONFIG_TRACE_IRQFLAGS
io_done:
#ifdef CONFIG_TRACE_IRQFLAGS
+ .section .data,"aw",@progbits
.align 8
.globl io_restore_trace_psw
io_restore_trace_psw:
.quad 0, io_restore_trace
.align 8
.globl io_restore_trace_psw
io_restore_trace_psw:
.quad 0, io_restore_trace
+ .previous
#endif
#
#endif
#