From owner-svn-src-all@FreeBSD.ORG  Sat Nov 20 18:24:09 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CC6C21065673;
	Sat, 20 Nov 2010 18:24:09 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BAE798FC13;
	Sat, 20 Nov 2010 18:24:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAKIO9g0021443;
	Sat, 20 Nov 2010 18:24:09 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAKIO95j021441;
	Sat, 20 Nov 2010 18:24:09 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201011201824.oAKIO95j021441@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sat, 20 Nov 2010 18:24:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215575 - stable/8/sys/x86/x86
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Nov 2010 18:24:09 -0000

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>