From 4b01445668b051a007eae5a908737ecf625355af Mon Sep 17 00:00:00 2001 From: Michael Holzheu Date: Mon, 15 Oct 2012 15:09:08 +0200 Subject: [PATCH] --- yaml --- r: 334739 b: refs/heads/master c: 9db8c050f6d16d925298f13f2b468342b37d4eee h: refs/heads/master i: 334737: 813f3c43d6ced8b4c4b9d3d9fb12dfe05f3a4c10 334735: 71e5d6deae4f780e3a9530e0ae73b1996dde4e3a v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/head_kdump.S | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 230c80f25565..f325f21de5ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f47586b24c43adadd19c7e3f532a601d6eed728d +refs/heads/master: 9db8c050f6d16d925298f13f2b468342b37d4eee diff --git a/trunk/arch/s390/kernel/head_kdump.S b/trunk/arch/s390/kernel/head_kdump.S index acaaaf4b7055..085a95eb315f 100644 --- a/trunk/arch/s390/kernel/head_kdump.S +++ b/trunk/arch/s390/kernel/head_kdump.S @@ -85,16 +85,10 @@ .align 2 startup_kdump_relocated: basr %r13,0 -0: - mvc 0(8,%r0),.Lrestart_psw-0b(%r13) # Setup restart PSW - sam31 # Switch to 31 bit addr mode - sr %r1,%r1 # Erase register r1 - sr %r2,%r2 # Erase register r2 - sigp %r1,%r2,SIGP_SET_ARCHITECTURE # Switch to 31 bit arch mode - lpsw 0 # Start new kernel... +0: lpswe .Lrestart_psw-0b(%r13) # Start new kernel... .align 8 .Lrestart_psw: - .long 0x00080000,0x80000000 + startup + .quad 0x0000000080000000,0x0000000000000000 + startup #else .align 2 .Lep_startup_kdump: