diff options
| author | Michael Holzheu <holzheu@linux.vnet.ibm.com> | 2012-10-15 15:09:08 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-10-18 17:50:09 +0200 |
| commit | 9db8c050f6d16d925298f13f2b468342b37d4eee (patch) | |
| tree | adcc56a625cd4148f9ab1203c8395e21986fc38d /arch/s390 | |
| parent | f47586b24c43adadd19c7e3f532a601d6eed728d (diff) | |
| download | linux-stable-9db8c050f6d16d925298f13f2b468342b37d4eee.tar.gz linux-stable-9db8c050f6d16d925298f13f2b468342b37d4eee.tar.bz2 linux-stable-9db8c050f6d16d925298f13f2b468342b37d4eee.zip | |
s390/kdump: Use 64 bit mode for 0x10000 entry point
The 0x10000 entry point can be called in z/Arch architecture and 64 bit
addressing mode. Therefore this patch removes the unnecessary 31 bit
switch code from the kdump startup function.
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/head_kdump.S | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/s390/kernel/head_kdump.S b/arch/s390/kernel/head_kdump.S index acaaaf4b7055..085a95eb315f 100644 --- a/arch/s390/kernel/head_kdump.S +++ b/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: |