From 086dcf7e86461fd5b1eb18e47d0e3d136a959e5e Mon Sep 17 00:00:00 2001 From: Patrick Mooney Date: Thu, 21 Sep 2017 18:03:12 +0000 Subject: [PATCH] 8667 die() misleads with KERNELBASE Reviewed by: Jerry Jelinek Reviewed by: Robert Mustacchi Approved by: Gordon Ross --- usr/src/uts/i86pc/os/trap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/src/uts/i86pc/os/trap.c b/usr/src/uts/i86pc/os/trap.c index b7bb1e6fa6..1d1cf4f416 100644 --- a/usr/src/uts/i86pc/os/trap.c +++ b/usr/src/uts/i86pc/os/trap.c @@ -32,7 +32,7 @@ /* */ /* - * Copyright 2012 Joyent, Inc. All rights reserved. + * Copyright 2017 Joyent, Inc. */ #include @@ -213,7 +213,7 @@ die(uint_t type, struct regs *rp, caddr_t addr, processorid_t cpuid) curthread->t_panic_trap = &ti; - if (type == T_PGFLT && addr < (caddr_t)KERNELBASE) { + if (type == T_PGFLT && addr < (caddr_t)kernelbase) { panic("BAD TRAP: type=%x (#%s %s) rp=%p addr=%p " "occurred in module \"%s\" due to %s", type, trap_mnemonic, trap_name, (void *)rp, (void *)addr, -- 2.11.4.GIT