Module Name: src
Committed By: dsl
Date: Wed Feb 19 21:23:02 UTC 2014
Modified Files:
src/sys/arch/i386/i386: compat_16_machdep.c process_machdep.c
src/sys/arch/x86/acpi: acpi_wakeup.c
src/sys/arch/x86/x86: cpu.c ipi.c
src/sys/compat/linux/arch/i386: linux_machdep.c
Log Message:
Add explicit #include <x86/fpu.h> instead of relying on pcb.h including it.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/i386/compat_16_machdep.c
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/i386/i386/process_machdep.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/x86/acpi/acpi_wakeup.c
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x86/x86/ipi.c
cvs rdiff -u -r1.157 -r1.158 src/sys/compat/linux/arch/i386/linux_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/i386/compat_16_machdep.c
diff -u src/sys/arch/i386/i386/compat_16_machdep.c:1.25 src/sys/arch/i386/i386/compat_16_machdep.c:1.26
--- src/sys/arch/i386/i386/compat_16_machdep.c:1.25 Sat Feb 15 10:11:15 2014
+++ src/sys/arch/i386/i386/compat_16_machdep.c Wed Feb 19 21:23:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_machdep.c,v 1.25 2014/02/15 10:11:15 dsl Exp $ */
+/* $NetBSD: compat_16_machdep.c,v 1.26 2014/02/19 21:23:01 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.25 2014/02/15 10:11:15 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.26 2014/02/19 21:23:01 dsl Exp $");
#ifdef _KERNEL_OPT
#include "opt_vm86.h"
@@ -55,6 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: compat_16_ma
#include <machine/pmap.h>
#include <machine/vmparam.h>
+#include <x86/fpu.h>
#if defined(COMPAT_16) || defined(COMPAT_IBCS2)
Index: src/sys/arch/i386/i386/process_machdep.c
diff -u src/sys/arch/i386/i386/process_machdep.c:1.84 src/sys/arch/i386/i386/process_machdep.c:1.85
--- src/sys/arch/i386/i386/process_machdep.c:1.84 Sat Feb 15 22:20:41 2014
+++ src/sys/arch/i386/i386/process_machdep.c Wed Feb 19 21:23:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.84 2014/02/15 22:20:41 dsl Exp $ */
+/* $NetBSD: process_machdep.c,v 1.85 2014/02/19 21:23:01 dsl Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.84 2014/02/15 22:20:41 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.85 2014/02/19 21:23:01 dsl Exp $");
#include "opt_vm86.h"
#include "opt_ptrace.h"
@@ -71,6 +71,8 @@ __KERNEL_RCSID(0, "$NetBSD: process_mach
#include <machine/reg.h>
#include <machine/segments.h>
+#include <x86/fpu.h>
+
#ifdef VM86
#include <machine/vm86.h>
#endif
Index: src/sys/arch/x86/acpi/acpi_wakeup.c
diff -u src/sys/arch/x86/acpi/acpi_wakeup.c:1.36 src/sys/arch/x86/acpi/acpi_wakeup.c:1.37
--- src/sys/arch/x86/acpi/acpi_wakeup.c:1.36 Tue Feb 11 20:17:16 2014
+++ src/sys/arch/x86/acpi/acpi_wakeup.c Wed Feb 19 21:23:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakeup.c,v 1.36 2014/02/11 20:17:16 dsl Exp $ */
+/* $NetBSD: acpi_wakeup.c,v 1.37 2014/02/19 21:23:01 dsl Exp $ */
/*-
* Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.36 2014/02/11 20:17:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.37 2014/02/19 21:23:01 dsl Exp $");
/*-
* Copyright (c) 2001 Takanori Watanabe <takaw...@jp.freebsd.org>
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.36 2014/02/11 20:17:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.37 2014/02/19 21:23:01 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -101,6 +101,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.
#include <x86/cpuvar.h>
#include <x86/x86/tsc.h>
+#include <x86/fpu.h>
#include "opt_vga.h"
Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.108 src/sys/arch/x86/x86/cpu.c:1.109
--- src/sys/arch/x86/x86/cpu.c:1.108 Sun Jan 26 19:16:17 2014
+++ src/sys/arch/x86/x86/cpu.c Wed Feb 19 21:23:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.108 2014/01/26 19:16:17 dsl Exp $ */
+/* $NetBSD: cpu.c,v 1.109 2014/02/19 21:23:02 dsl Exp $ */
/*-
* Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.108 2014/01/26 19:16:17 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.109 2014/02/19 21:23:02 dsl Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -103,6 +103,8 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.10
#include <machine/pio.h>
#include <machine/cpu_counter.h>
+#include <x86/fpu.h>
+
#ifdef i386
#include <machine/tlog.h>
#endif
Index: src/sys/arch/x86/x86/ipi.c
diff -u src/sys/arch/x86/x86/ipi.c:1.22 src/sys/arch/x86/x86/ipi.c:1.23
--- src/sys/arch/x86/x86/ipi.c:1.22 Tue Feb 11 20:17:16 2014
+++ src/sys/arch/x86/x86/ipi.c Wed Feb 19 21:23:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ipi.c,v 1.22 2014/02/11 20:17:16 dsl Exp $ */
+/* $NetBSD: ipi.c,v 1.23 2014/02/19 21:23:02 dsl Exp $ */
/*-
* Copyright (c) 2000, 2008, 2009 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipi.c,v 1.22 2014/02/11 20:17:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipi.c,v 1.23 2014/02/19 21:23:02 dsl Exp $");
#include "opt_mtrr.h"
@@ -56,9 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: ipi.c,v 1.22
#include "acpica.h"
-#ifdef __x86_64__
#include <x86/fpu.h>
-#endif
static void x86_ipi_halt(struct cpu_info *);
static void x86_ipi_kpreempt(struct cpu_info *);
Index: src/sys/compat/linux/arch/i386/linux_machdep.c
diff -u src/sys/compat/linux/arch/i386/linux_machdep.c:1.157 src/sys/compat/linux/arch/i386/linux_machdep.c:1.158
--- src/sys/compat/linux/arch/i386/linux_machdep.c:1.157 Sat Feb 15 10:11:15 2014
+++ src/sys/compat/linux/arch/i386/linux_machdep.c Wed Feb 19 21:23:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.157 2014/02/15 10:11:15 dsl Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.158 2014/02/19 21:23:02 dsl Exp $ */
/*-
* Copyright (c) 1995, 2000, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.157 2014/02/15 10:11:15 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.158 2014/02/19 21:23:02 dsl Exp $");
#if defined(_KERNEL_OPT)
#include "opt_vm86.h"
@@ -86,6 +86,8 @@ __KERNEL_RCSID(0, "$NetBSD: linux_machde
#include <machine/vm86.h>
#include <machine/vmparam.h>
+#include <x86/fpu.h>
+
/*
* To see whether wscons is configured (for virtual console ioctl calls).
*/
