Date: Sat, 20 Nov 2010 18:24:09 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r215575 - stable/8/sys/x86/x86 Message-ID: <201011201824.oAKIO95j021441@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Sat Nov 20 18:24:09 2010 New Revision: 215575 URL: http://svn.freebsd.org/changeset/base/215575 Log: Add a second fix-up for the PC98 case. PC98 cases might be explicit in presence of a difference with i386 because both are defined, leading to mishandling of code in circumstances like this. Reported by: nyan Modified: stable/8/sys/x86/x86/nexus.c Modified: stable/8/sys/x86/x86/nexus.c ============================================================================== --- stable/8/sys/x86/x86/nexus.c Sat Nov 20 17:27:38 2010 (r215574) +++ stable/8/sys/x86/x86/nexus.c Sat Nov 20 18:24:09 2010 (r215575) @@ -76,12 +76,12 @@ __FBSDID("$FreeBSD$"); #ifdef DEV_ISA #include <isa/isavar.h> -#ifdef __amd64__ +#ifdef PC98 +#include <pc98/cbus/cbus.h> +#elif defined(__amd64__) #include <amd64/isa/isa.h> -#elif defined(__i386__) -#include <i386/isa/isa.h> #else -#include <pc98/cbus/cbus.h> +#include <i386/isa/isa.h> #endif #endif #include <sys/rtprio.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011201824.oAKIO95j021441>