Date: Sun, 5 Apr 2009 21:52:14 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r190750 - head/sys/powerpc/aim Message-ID: <200904052152.n35LqEx7035019@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Sun Apr 5 21:52:13 2009 New Revision: 190750 URL: http://svn.freebsd.org/changeset/base/190750 Log: 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. Modified: head/sys/powerpc/aim/machdep.c Modified: head/sys/powerpc/aim/machdep.c ============================================================================== --- head/sys/powerpc/aim/machdep.c Sun Apr 5 21:24:15 2009 (r190749) +++ head/sys/powerpc/aim/machdep.c Sun Apr 5 21:52:13 2009 (r190750) @@ -383,7 +383,10 @@ powerpc_init(u_int startkernel, u_int en 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904052152.n35LqEx7035019>