[kvm-unit-tests,PULL,1/1] s390x: Fixup interrupt psws
diff mbox series

Message ID 1542369121-8879-2-git-send-email-thuth@redhat.com
State New
Headers show
Series
  • [kvm-unit-tests,PULL,1/1] s390x: Fixup interrupt psws
Related show

Commit Message

Thomas Huth Nov. 16, 2018, 11:52 a.m. UTC
From: Janosch Frank <frankja@linux.ibm.com>

Let's use the svc psw instead of the mcck psw for svc interrupts
and name it supervisor call. Also we exchange the io int psw for the
right one.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 lib/s390x/interrupt.c | 2 +-
 s390x/cstart64.S      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Patch
diff mbox series

diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c
index 848d5f2..cf0a794 100644
--- a/lib/s390x/interrupt.c
+++ b/lib/s390x/interrupt.c
@@ -125,6 +125,6 @@  void handle_io_int(void)
 
 void handle_svc_int(void)
 {
-	report_abort("Unexpected service call interrupt: at %#lx",
+	report_abort("Unexpected supervisor call interrupt: at %#lx",
 		     lc->svc_old_psw.addr);
 }
diff --git a/s390x/cstart64.S b/s390x/cstart64.S
index d6d40b7..dc7ddd6 100644
--- a/s390x/cstart64.S
+++ b/s390x/cstart64.S
@@ -33,10 +33,10 @@  init_psw_cont:
 	larl	%r1, mcck_int_psw
 	mvc	GEN_LC_MCCK_NEW_PSW(16), 0(%r1)
 	/* setup io interrupt handler */
-	larl	%r1, ext_int_psw
+	larl	%r1, io_int_psw
 	mvc	GEN_LC_IO_NEW_PSW(16), 0(%r1)
 	/* setup svc interrupt handler */
-	larl	%r1, mcck_int_psw
+	larl	%r1, svc_int_psw
 	mvc	GEN_LC_SVC_NEW_PSW(16), 0(%r1)
 	/* setup cr0, enabling e.g. AFP-register control */
 	larl	%r1, initial_cr0