diff options
author | Radim Krčmář <rkrcmar@redhat.com> | 2018-09-07 18:30:47 +0200 |
---|---|---|
committer | Radim Krčmář <rkrcmar@redhat.com> | 2018-09-07 18:30:47 +0200 |
commit | ed2ef29100644eabc6099cbf1a3aa9d938555ab8 (patch) | |
tree | dadd3eb5d77ae2c44adc92869c662292bd652f46 /arch/x86/mm/fault.c | |
parent | 732b53146ac8f604e45c593efe0579f78205fdcc (diff) | |
parent | df88f3181f10565c6e3a89eb6f0f9e6afaaf15f1 (diff) |
Merge tag 'kvm-s390-master-4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
KVM: s390: Fixes for 4.19
- Fallout from the hugetlbfs support: pfmf interpretion and locking
- VSIE: fix keywrapping for nested guests
Diffstat (limited to 'arch/x86/mm/fault.c')
-rw-r--r-- | arch/x86/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index b9123c497e0a..47bebfe6efa7 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -837,7 +837,7 @@ show_signal_msg(struct pt_regs *regs, unsigned long error_code, printk(KERN_CONT "\n"); - show_opcodes((u8 *)regs->ip, loglvl); + show_opcodes(regs, loglvl); } static void |