1 files changed, 8 insertions, 1 deletions

diff --git a/arch/ppc64/xmon/xmon.c b/arch/ppc64/xmon/xmon.c
index 3c0ccb2623ae..7f6e13a4b71e 100644
--- a/arch/ppc64/xmon/xmon.c
+++ b/arch/ppc64/xmon/xmon.c
@@ -2247,7 +2247,14 @@ scanhex(unsigned long *vp)
                         tmpstr[i] = c;
                 }
                 tmpstr[i++] = 0;
-                *vp = kallsyms_lookup_name(tmpstr);
+                *vp = 0;
+                if (setjmp(bus_error_jmp) == 0) {
+                        catch_memory_errors = 1;
+                        sync();
+                        *vp = kallsyms_lookup_name(tmpstr);
+                        sync();
+                }
+                catch_memory_errors = 0;
                 if (!(*vp)) {
                         printf("unknown symbol '%s'\n", tmpstr);
                         return 0;