git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'powerpc-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
kernel
/
mce.c
diff --git
a/arch/powerpc/kernel/mce.c
b/arch/powerpc/kernel/mce.c
index 15e7b4900689af54b61000b4f405ba26d3cc849f..47a683cd00d246e6b8a5fe2f648802acd21cd8e4 100644
(file)
--- a/
arch/powerpc/kernel/mce.c
+++ b/
arch/powerpc/kernel/mce.c
@@
-274,7
+274,7
@@
void mce_common_process_ue(struct pt_regs *regs,
entry = search_kernel_exception_table(regs->nip);
if (entry) {
mce_err->ignore_event = true;
- regs
->nip = extable_fixup(entry
);
+ regs
_set_return_ip(regs, extable_fixup(entry)
);
}
}