svn commit: r202441 - head/sys/conf

[Bjoern A. Zeeb]

On Sun, 17 Jan 2010, TAKAHASHI Yoshihiro wrote:

> In article <3bbf2fe11001160736h185d8916ma0ba074f6a6a6dca at mail.gmail.com>
> Attilio Rao <attilio at 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.