diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-08-26 11:20:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-08-26 11:20:55 +0200 |
| commit | b3e30c9884407599353e690a4eb36d0c4671bf62 (patch) | |
| tree | d752d32d8a1a395cacd220313f24b933b2ed7294 /arch/s390/boot/head.S | |
| parent | x86/msr-index: Move AMD MSRs where they belong (diff) | |
| parent | Linux 5.3-rc6 (diff) | |
| download | linux-b3e30c9884407599353e690a4eb36d0c4671bf62.tar.xz linux-b3e30c9884407599353e690a4eb36d0c4671bf62.zip | |
Merge tag 'v5.3-rc6' into x86/cpu, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/boot/head.S')
| -rw-r--r-- | arch/s390/boot/head.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/boot/head.S b/arch/s390/boot/head.S index 028aab03a9e7..2087bed6e60f 100644 --- a/arch/s390/boot/head.S +++ b/arch/s390/boot/head.S @@ -361,6 +361,7 @@ ENTRY(startup_kdump) .quad 0 # INITRD_SIZE .quad 0 # OLDMEM_BASE .quad 0 # OLDMEM_SIZE + .quad kernel_version # points to kernel version string .org COMMAND_LINE .byte "root=/dev/ram0 ro" |