aboutsummaryrefslogtreecommitdiff
path: root/arch/s390
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-05-02 22:31:13 -0400
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-05-02 22:31:13 -0400
commit60e677bfffd835ef56d8a2f25f9a2f8eaa8f2b7c (patch)
treef08c3de386ee6289abbb1a7180c06f6c7c67a2c7 /arch/s390
parentfbd46dc5333e0bc45719a7ed38d3411aef7dcd61 (diff)
parent60584ef99395a89d136399bbc127289a4aa29dc7 (diff)
downloadlinux-linaro-android-60e677bfffd835ef56d8a2f25f9a2f8eaa8f2b7c.tar.gz
Merge commit 'v2.6.38.5' into linaro-2.6.38
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kvm/sie64a.S4
-rw-r--r--arch/s390/mm/fault.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/s390/kvm/sie64a.S b/arch/s390/kvm/sie64a.S
index 7e9d30d567b..ab0e041ac54 100644
--- a/arch/s390/kvm/sie64a.S
+++ b/arch/s390/kvm/sie64a.S
@@ -48,10 +48,10 @@ sie_irq_handler:
tm __TI_flags+7(%r2),_TIF_EXIT_SIE
jz 0f
larl %r2,sie_exit # work pending, leave sie
- stg %r2,__LC_RETURN_PSW+8
+ stg %r2,SPI_PSW+8(0,%r15)
br %r14
0: larl %r2,sie_reenter # re-enter with guest id
- stg %r2,__LC_RETURN_PSW+8
+ stg %r2,SPI_PSW+8(0,%r15)
1: br %r14
/*
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index f07b4d2cb53..7bbd2bb75a5 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -568,9 +568,9 @@ static void pfault_interrupt(unsigned int ext_int_code,
* Get the token (= address of the task structure of the affected task).
*/
#ifdef CONFIG_64BIT
- tsk = *(struct task_struct **) param64;
+ tsk = (struct task_struct *) param64;
#else
- tsk = *(struct task_struct **) param32;
+ tsk = (struct task_struct *) param32;
#endif
if (subcode & 0x0080) {