diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2019-02-22 00:09:56 +1100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-02-22 00:09:56 +1100 |
commit | e121ee6bc30a76b73eeb228ea521437c9c39a852 (patch) | |
tree | 06b45b530539aba46d9316becb62b1512b909b63 /arch/powerpc/platforms | |
parent | d0055df0c9c1471c389197a69f43e300185a75aa (diff) | |
parent | c05772018491e5294f55d63b239ab0d532e96616 (diff) | |
download | linux-e121ee6bc30a76b73eeb228ea521437c9c39a852.tar.gz linux-e121ee6bc30a76b73eeb228ea521437c9c39a852.tar.bz2 linux-e121ee6bc30a76b73eeb228ea521437c9c39a852.zip |
Merge branch 'topic/ppc-kvm' into next
Merge commits we're sharing with kvm-ppc tree.
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/powernv/opal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c index d1072d464e99..2ca3ba95f8aa 100644 --- a/arch/powerpc/platforms/powernv/opal.c +++ b/arch/powerpc/platforms/powernv/opal.c @@ -586,7 +586,7 @@ int opal_machine_check(struct pt_regs *regs) evt.version); return 0; } - machine_check_print_event_info(&evt, user_mode(regs)); + machine_check_print_event_info(&evt, user_mode(regs), false); if (opal_recover_mce(regs, &evt)) return 1; |