From owner-svn-src-head@FreeBSD.ORG  Sun Jan 17 19:10:08 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F37F7106566B;
	Sun, 17 Jan 2010 19:10:07 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from mail.cksoft.de (mail.cksoft.de [IPv6:2001:4068:10::3])
	by mx1.freebsd.org (Postfix) with ESMTP id AADE38FC18;
	Sun, 17 Jan 2010 19:10:07 +0000 (UTC)
Received: from localhost (amavis.fra.cksoft.de [192.168.74.71])
	by mail.cksoft.de (Postfix) with ESMTP id 15FCE41C757;
	Sun, 17 Jan 2010 20:10:07 +0100 (CET)
X-Virus-Scanned: amavisd-new at cksoft.de
Received: from mail.cksoft.de ([192.168.74.103])
	by localhost (amavis.fra.cksoft.de [192.168.74.71]) (amavisd-new,
	port 10024)
	with ESMTP id Wg8jYtvqTEwK; Sun, 17 Jan 2010 20:10:06 +0100 (CET)
Received: by mail.cksoft.de (Postfix, from userid 66)
	id 4C2E841C759; Sun, 17 Jan 2010 20:10:06 +0100 (CET)
Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net
	[10.111.66.10])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.int.zabbadoz.net (Postfix) with ESMTP id 77F2D4448EC;
	Sun, 17 Jan 2010 19:06:26 +0000 (UTC)
Date: Sun, 17 Jan 2010 19:06:26 +0000 (UTC)
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
X-X-Sender: bz@maildrop.int.zabbadoz.net
To: TAKAHASHI Yoshihiro <nyan@FreeBSD.org>
In-Reply-To: <20100117.124146.27866377.nyan@FreeBSD.org>
Message-ID: <20100117190512.A50938@maildrop.int.zabbadoz.net>
References: <201001161224.o0GCOCOI094360@svn.freebsd.org>
	<20100116.220840.91363215.nyan@FreeBSD.org>
	<3bbf2fe11001160736h185d8916ma0ba074f6a6a6dca@mail.gmail.com>
	<20100117.124146.27866377.nyan@FreeBSD.org>
X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Cc: attilio@freebsd.org, svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r202441 - head/sys/conf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Jan 2010 19:10:08 -0000

On Sun, 17 Jan 2010, TAKAHASHI Yoshihiro wrote:

> In article <3bbf2fe11001160736h185d8916ma0ba074f6a6a6dca@mail.gmail.com>
> Attilio Rao <attilio@freebsd.org> writes:
>
>> Thanks for reporting this.
>> This further patch should fix the problem for i386 and possibly pc98
>> (linked with your patch):
>> http://www.freebsd.org/~attilio/atpic.diff
>
> Please apply the same change to sys/pc98/cbus/clock.c, and it's fine.
>
> Please feel free to commit my patch.

Something similar is also still needed for i386 as the XBOX kernel
still doesn't compile.

I would have tested the following patch there, just when I found this
thread:

Index: sys/i386/isa/clock.c
===================================================================
--- sys/i386/isa/clock.c        (revision 202484)
+++ sys/i386/isa/clock.c        (working copy)
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
   */

  #include "opt_apic.h"
+#include "opt_atpic.h"
  #include "opt_clock.h"
  #include "opt_kdtrace.h"
  #include "opt_isa.h"
@@ -65,7 +66,7 @@ __FBSDID("$FreeBSD$");
  #include <machine/frame.h>
  #include <machine/intr_machdep.h>
  #include <machine/md_var.h>
-#ifdef DEV_APIC
+#if defined(DEV_APIC) || defined(DEV_ATPIC)
  #include <machine/apicvar.h>
  #endif
  #include <machine/ppireg.h>


-- 
Bjoern A. Zeeb         It will not break if you know what you are doing.