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 branch 'drm-radeon-evergreen-accel' into drm-core-next
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
entry.S
diff --git
a/arch/s390/kernel/entry.S
b/arch/s390/kernel/entry.S
index
4348f9b
..
6af7045
100644
(file)
--- a/
arch/s390/kernel/entry.S
+++ b/
arch/s390/kernel/entry.S
@@
-964,7
+964,7
@@
cleanup_critical:
clc 4(4,%r12),BASED(cleanup_table_io_work_loop)
bl BASED(0f)
clc 4(4,%r12),BASED(cleanup_table_io_work_loop+4)
clc 4(4,%r12),BASED(cleanup_table_io_work_loop)
bl BASED(0f)
clc 4(4,%r12),BASED(cleanup_table_io_work_loop+4)
- bl BASED(cleanup_io_
return
)
+ bl BASED(cleanup_io_
work_loop
)
0:
br %r14
0:
br %r14
@@
-1038,6
+1038,12
@@
cleanup_sysc_leave_insn:
.long sysc_done - 8 + 0x80000000
cleanup_io_return:
.long sysc_done - 8 + 0x80000000
cleanup_io_return:
+ mvc __LC_RETURN_PSW(4),0(%r12)
+ mvc __LC_RETURN_PSW+4(4),BASED(cleanup_table_io_return)
+ la %r12,__LC_RETURN_PSW
+ br %r14
+
+cleanup_io_work_loop:
mvc __LC_RETURN_PSW(4),0(%r12)
mvc __LC_RETURN_PSW+4(4),BASED(cleanup_table_io_work_loop)
la %r12,__LC_RETURN_PSW
mvc __LC_RETURN_PSW(4),0(%r12)
mvc __LC_RETURN_PSW+4(4),BASED(cleanup_table_io_work_loop)
la %r12,__LC_RETURN_PSW