Wed Feb 19 20:50:56 2014 UTC ()
Don't rely on pcb.h including x86/include/sysarch.h


(dsl)
diff -r1.47 -r1.48 src/sys/compat/linux/arch/amd64/linux_machdep.c
cvs diff -r1.47 -r1.48 src/sys/compat/linux/arch/amd64/linux_machdep.c (expand / switch to unified diff)

--- src/sys/compat/linux/arch/amd64/linux_machdep.c 2014/02/15 10:11:15 1.47
+++ src/sys/compat/linux/arch/amd64/linux_machdep.c 2014/02/19 20:50:56 1.48
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: linux_machdep.c,v 1.47 2014/02/15 10:11:15 dsl Exp $ */ 1/* $NetBSD: linux_machdep.c,v 1.48 2014/02/19 20:50:56 dsl Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. 4 * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 3. All advertising materials mentioning features or use of this software 14 * 3. All advertising materials mentioning features or use of this software
@@ -23,44 +23,45 @@ @@ -23,44 +23,45 @@
23 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 23 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
24 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS  24 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
25 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 25 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
26 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 26 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
27 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
28 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 28 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
29 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 29 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31 * POSSIBILITY OF SUCH DAMAGE. 31 * POSSIBILITY OF SUCH DAMAGE.
32 */ 32 */
33 33
34#include <sys/cdefs.h> 34#include <sys/cdefs.h>
35 35
36__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.47 2014/02/15 10:11:15 dsl Exp $"); 36__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.48 2014/02/19 20:50:56 dsl Exp $");
37 37
38#include <sys/param.h> 38#include <sys/param.h>
39#include <sys/types.h> 39#include <sys/types.h>
40#include <sys/systm.h> 40#include <sys/systm.h>
41#include <sys/signal.h> 41#include <sys/signal.h>
42#include <sys/exec.h> 42#include <sys/exec.h>
43#include <sys/proc.h> 43#include <sys/proc.h>
44#include <sys/ptrace.h> /* for process_read_fpregs() */ 44#include <sys/ptrace.h> /* for process_read_fpregs() */
45#include <sys/ucontext.h> 45#include <sys/ucontext.h>
46#include <sys/conf.h> 46#include <sys/conf.h>
47 47
48#include <machine/reg.h> 48#include <machine/reg.h>
49#include <machine/pcb.h> 49#include <machine/pcb.h>
50#include <machine/mcontext.h> 50#include <machine/mcontext.h>
51#include <machine/specialreg.h> 51#include <machine/specialreg.h>
52#include <machine/vmparam.h> 52#include <machine/vmparam.h>
53#include <machine/cpufunc.h> 53#include <machine/cpufunc.h>
 54#include <x86/include/sysarch.h>
54 55
55/*  56/*
56 * To see whether wscons is configured (for virtual console ioctl calls). 57 * To see whether wscons is configured (for virtual console ioctl calls).
57 */ 58 */
58#if defined(_KERNEL_OPT) 59#if defined(_KERNEL_OPT)
59#include "wsdisplay.h" 60#include "wsdisplay.h"
60#endif 61#endif
61#if (NWSDISPLAY > 0) 62#if (NWSDISPLAY > 0)
62#include <dev/wscons/wsconsio.h> 63#include <dev/wscons/wsconsio.h>
63#include <dev/wscons/wsdisplay_usl_io.h> 64#include <dev/wscons/wsdisplay_usl_io.h>
64#endif 65#endif
65 66
66 67