summaryrefslogtreecommitdiffstats
path: root/sys/powerpc/aim
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2009-04-05 21:52:13 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2009-04-05 21:52:13 +0000
commit18eefdb2b28b2ccc1394a40d490c6b1b0c80086d (patch)
tree8b4557df47b5fe18f73e295c103c26c90ba64cd4 /sys/powerpc/aim
parent20f118148b11fb7c46157fc8a5bb4646414a8702 (diff)
downloadFreeBSD-src-18eefdb2b28b2ccc1394a40d490c6b1b0c80086d.zip
FreeBSD-src-18eefdb2b28b2ccc1394a40d490c6b1b0c80086d.tar.gz
Fix the build when KDB is disabled. The second instance of rfi in
trap_subr.S that is patched at runtime to rfid on 64-bit systems is inside KDB-specific code, so don't patch it without KDB.
Diffstat (limited to 'sys/powerpc/aim')
-rw-r--r--sys/powerpc/aim/machdep.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c
index 75476f5..e00268a 100644
--- a/sys/powerpc/aim/machdep.c
+++ b/sys/powerpc/aim/machdep.c
@@ -383,7 +383,10 @@ powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp)
if (ppc64) {
/* Patch the two instances of rfi -> rfid */
bcopy(&rfid_patch,&rfi_patch1,4);
+ #ifdef KDB
+ /* rfi_patch2 is at the end of dbleave */
bcopy(&rfid_patch,&rfi_patch2,4);
+ #endif
/*
* Copy a code snippet to restore 32-bit bridge mode
OpenPOWER on IntegriCloud