Remove libkern, leave just header.

Boot stuff dependencies from NetBSD. Patch by Antoine Leca. Relocated to src/sys. The port is using the same libminc.a as usual MINIX services (and does not use NetBSD libkern); the headers imported from NetBSD sys/ tree have been kept to a minimum (still numbers higher than 30 though.) Note the peculiar way to use libraries (libsa, libi386, etc.): the source code is shared, but each component builds its own copy of the library, with its own set of preprocessor defines.
2012-01-25 16:29:07 +04:00
parent 002fecdd9e
commit 7f2d47d84c
156 changed files with 6819 additions and 17149 deletions
--- a/sys/arch/i386/stand/boot/Makefile.boot
+++ b/sys/arch/i386/stand/boot/Makefile.boot
@@ -7,6 +7,7 @@ PROG?= boot
 NEWVERSWHAT?= "BIOS Boot"
 VERSIONFILE?= ${.CURDIR}/../version

+ACTIVE_CC?= ${CC}
 AFLAGS.biosboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}

 SOURCES?= biosboot.S boot2.c conf.c devopen.c exec.c
@@ -57,6 +58,10 @@ COPTS+=    -ffreestanding
 CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes
 CPPFLAGS+= -nostdinc -D_STANDALONE
 CPPFLAGS+= -I$S
+.if defined(__MINIX)
+CPPFLAGS+= -I${DESTDIR}/usr/include
+CPPFLAGS+= -I${.CURDIR}/../../../../../../
+.endif

 CPPFLAGS+= -DSUPPORT_PS2
 CPPFLAGS+= -DDIRECT_SERIAL
@@ -119,15 +124,21 @@ SAMISCMAKEFLAGS+="SA_ENABLE_LS_OP=yes"
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA= ${SALIB}

+.ifndef __MINIX
 ### find out what to use for libkern
 KERN_AS= library
 .include "${S}/lib/libkern/Makefile.inc"
 LIBKERN= ${KERNLIB}
+.else
+# MINIX
+LIBKERN= # use MINIX minc
+.endif

 ### find out what to use for libz
 Z_AS= library
 .include "${S}/lib/libz/Makefile.inc"
 LIBZ= ${ZLIB}
+## XXX ??? LIBZ is set up as usual, we use the regular one


 cleandir distclean: .WAIT cleanlibdir
@@ -149,7 +160,7 @@ vers.c: ${VERSIONFILE} ${SOURCES} ${LIBLIST} ${.CURDIR}/../Makefile.boot
 ${PROG}: ${OBJS} ${LIBLIST} ${.CURDIR}/../Makefile.boot
 	${_MKTARGET_LINK}
 	bb="$$( ${CC} -o ${PROG}.syms ${LDFLAGS} -Wl,-Ttext,0 -Wl,-cref \
-	    ${OBJS} ${LIBLIST} | ( \
+	    ${OBJS} ${LIBLIST} ${LDADD} | ( \
 		while read symbol file; do \
 			[ -z "$$file" ] && continue; \
 			[ "$$symbol" = real_to_prot ] && break; \
@@ -165,7 +176,11 @@ ${PROG}: ${OBJS} ${LIBLIST} ${.CURDIR}/../Makefile.boot
 		done; \
 	) )"; \
 	${CC} -o ${PROG}.syms ${LDFLAGS} -Wl,-Ttext,0 \
-		-Wl,-Map,${PROG}.map -Wl,-cref ${OBJS} $$bb ${LIBLIST}
+		-Wl,-Map,${PROG}.map -Wl,-cref ${OBJS} $$bb ${LIBLIST} ${LDADD}
 	${OBJCOPY} -O binary ${PROG}.syms ${PROG}

+.ifndef	__MINIX
 .include <bsd.prog.mk>
+.else
+.include <minix.service.mk>
+.endif
--- a/sys/arch/i386/stand/bootxx/Makefile
+++ b/sys/arch/i386/stand/bootxx/Makefile
@@ -1,13 +1,20 @@
 # $NetBSD: Makefile,v 1.14 2010/12/29 17:44:03 jakllsch Exp $

+SUBDIR=
 #SUBDIR=	bootxx_ffsv1 .WAIT bootxx_ffsv2 bootxx_lfsv1 bootxx_lfsv2
 #SUBDIR+=bootxx_msdos bootxx_ustarfs

 # Ext2fs doesn't have enough free space (it has only 1KB)
 # to store this primary bootloader, but we can put it into
 # an independent small 'boot' partition as NetBSD/hp300 does.
-#SUBDIR+=bootxx_ext2fs
-SUBDIR=bootxx_minixfs3
+#
+# However MINIX implements a solution using the empty space before subpartition
+.if !empty(CC:M*pcc)
+# PCC cannot compile bootxx_ext2fs because it lacks regparm aka compactcall
+SUBDIR+=bootxx_minixfs3
+.else
+SUBDIR+=bootxx_ext2fs bootxx_minixfs3
+.endif

 LIBOBJ= ${.OBJDIR}
 .MAKEOVERRIDES+= LIBOBJ
--- a/sys/arch/i386/stand/bootxx/Makefile.bootxx
+++ b/sys/arch/i386/stand/bootxx/Makefile.bootxx
@@ -2,6 +2,7 @@

 S=	${.CURDIR}/../../../../..

+ACTIVE_CC?= ${CC}
 AFLAGS.bootxx.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 AFLAGS.label.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 AFLAGS.pbr.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
@@ -79,6 +80,10 @@ CPUFLAGS=  -march=i386 -mtune=i386
 CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes
 CPPFLAGS+= -nostdinc -D_STANDALONE
 CPPFLAGS+= -I$S
+.if defined(__MINIX)
+CPPFLAGS+= -I${DESTDIR}/usr/include
+CPPFLAGS+= -I${.CURDIR}/../../../../../../
+.endif

 CPPFLAGS+= -DLIBSA_SINGLE_FILESYSTEM=xxfs \
 		-DLIBSA_NO_TWIDDLE \
@@ -119,14 +124,21 @@ LIBI386= ${I386LIB}
 ### find out what to use for libsa
 SA_AS= library
 SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
+.if defined(__MINIX)
+SAMISCMAKEFLAGS+="SA_INCLUDE_NET=no"
+.endif
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA= ${SALIB}

+.if !defined(__MINIX)
 ### find out what to use for libkern
 KERN_AS=        library
 .include "${S}/lib/libkern/Makefile.inc"
 LIBKERN=        ${KERNLIB}
-
+.else
+# MINIX
+LIBKERN= # use MINIX minc
+.endif

 cleandir distclean: .WAIT cleanlibdir

@@ -140,7 +152,7 @@ CLEANFILES+= ${PROG}.sym ${PROG}.map
 ${PROG}: ${OBJS} ${LIBLIST}
 	${_MKTARGET_LINK}
 	${CC} -o ${PROG}.sym ${LDFLAGS} -Wl,-Ttext,${PRIMARY_LOAD_ADDRESS} \
-		-Wl,-Map,${PROG}.map -Wl,-cref ${OBJS} ${LIBLIST}
+		-Wl,-Map,${PROG}.map -Wl,-cref ${OBJS} ${LIBLIST} ${LDADD}
 	${OBJCOPY} -O binary ${PROG}.sym ${PROG}
 	@ sz=$$(${TOOL_STAT} -f '%z' ${PROG}); \
 	if [ "$$sz" -gt "${BOOTXX_MAXSIZE}" ]; then \
@@ -155,4 +167,8 @@ ${PROG}: ${OBJS} ${LIBLIST}
 		echo "${PROG} size $$sz, $$((${BOOTXX_MAXSIZE} - $$sz)) free"; \
 	fi

+.ifndef __MINIX
 .include <bsd.prog.mk>
+.else
+.include <minix.service.mk>
+.endif
--- a/sys/arch/i386/stand/bootxx/boot1.c
+++ b/sys/arch/i386/stand/bootxx/boot1.c
@@ -39,7 +39,11 @@ __RCSID("$NetBSD: boot1.c,v 1.20 2011/01/06 01:08:48 jakllsch Exp $");
 #include <sys/param.h>
 #include <sys/bootblock.h>
 #include <sys/disklabel.h>
+#ifndef __minix
 #include <dev/raidframe/raidframevar.h>	/* For RF_PROTECTED_SECTORS */
+#else
+#define RF_PROTECTED_SECTORS 64
+#endif

 #define XSTR(x) #x
 #define STR(x) XSTR(x)
@@ -72,7 +76,11 @@ boot1(uint32_t biosdev, uint64_t *sector)
 	bios_sector = *sector;
 	d.dev = biosdev;

+#ifdef __minix
+	putstr("\r\nMINIX/x86 " STR(FS) " Primary Bootstrap\r\n");
+#else
 	putstr("\r\nNetBSD/x86 " STR(FS) " Primary Bootstrap\r\n");
+#endif

 	if (set_geometry(&d, NULL))
 		return "set_geometry\r\n";
--- a/sys/arch/i386/stand/cdboot/Makefile
+++ b/sys/arch/i386/stand/cdboot/Makefile
@@ -1,13 +1,13 @@
 #	$NetBSD: Makefile,v 1.12 2011/05/20 22:29:55 joerg Exp $

-S=		${.CURDIR}/../../../..
-
 AFLAGS.cdboot.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}

 NOMAN=		# defined
 .include <bsd.own.mk>

 STRIPFLAG=	# nothing
+TOOL_SED?=	sed
+NM?=		nm

 LIBCRT0=	# nothing
 LIBCRTBEGIN=	# nothing
@@ -26,7 +26,7 @@ BINMODE=	444
 .PATH:		${.CURDIR}/..

 LDFLAGS+=	-nostdlib -Wl,-e,start
-CPPFLAGS+=	-I. -I${.CURDIR}/../lib -I${S}
+CPPFLAGS+=	-I. -I${.CURDIR}/../lib # -I${S}
 CPPFLAGS+=	-DPRIMARY_LOAD_ADDRESS=${PRIMARY_LOAD_ADDRESS}
 CPPFLAGS+=	-DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS}
 CPPFLAGS+=	-DDISABLE_KEYPRESS
@@ -36,12 +36,18 @@ LDFLAGS+=	-Wl,-m,elf_i386
 AFLAGS+=	-m32
 .endif

-AFLAGS+=	-Wa,--divide
-
+.if defined(_NetBSD_)
+# NetBSD can be compiled from a foreign host, MINIX do not. So commented out.
+# Make sys/ a local thing for benefit of cross-compilers
+S=		${.CURDIR}/../../../../..
+CPPFLAGS+=	-I${S}
+# And same for machine/; need a bit more work because of symlink
 BUILDSYMLINKS+=	$S/arch/i386/include	machine \
 		$S/arch/x86/include	x86
-
 DPSRCS+=	machine x86
+.endif
+
+AFLAGS+=	-Wa,--divide

 CLEANFILES+=	${PROG}.tmp

@@ -49,7 +55,7 @@ ${PROG}: ${OBJS}
 	${_MKTARGET_LINK}
 	${CC} -o ${PROG}.tmp ${LDFLAGS} -Wl,-Ttext,${PRIMARY_LOAD_ADDRESS} \
 	    ${OBJS}
-	@ set -- $$( ${NM} -t d ${PROG}.tmp | grep '\<free_space\>' \
+	@ set -- $$( ${NM} -t d ${PROG}.tmp | grep 'free_space' \
 		| ${TOOL_SED} 's/^0*//'  ); \
 		echo "#### There are $$1 free bytes in ${PROG}"
 	${OBJCOPY} -O binary ${PROG}.tmp ${PROG}
--- a/sys/arch/i386/stand/lib/Makefile
+++ b/sys/arch/i386/stand/lib/Makefile
@@ -11,6 +11,7 @@ I386_INCLUDE_DOS?= no
 I386_INCLUDE_BUS?= no
 I386_INCLUDE_PS2?= yes

+ACTIVE_CC?= ${CC}
 AFLAGS.biosdelay.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 AFLAGS.biosgetrtc.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
 AFLAGS.biosgetsystime.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
--- a/sys/arch/x86/include/bootinfo.h
+++ b/sys/arch/x86/include/bootinfo.h
@@ -0,0 +1,241 @@
+/*	$NetBSD: bootinfo.h,v 1.19 2011/11/28 07:56:54 tls Exp $	*/
+
+/*
+ * Copyright (c) 1997
+ *	Matthias Drochner.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#define BTINFO_BOOTPATH		0
+#define BTINFO_ROOTDEVICE	1
+#define BTINFO_BOOTDISK		3
+#define BTINFO_NETIF		4
+#define BTINFO_CONSOLE		6
+#define BTINFO_BIOSGEOM		7
+#define BTINFO_SYMTAB		8
+#define BTINFO_MEMMAP		9
+#define	BTINFO_BOOTWEDGE	10
+#define BTINFO_MODULELIST	11
+#define BTINFO_FRAMEBUFFER	12
+#define BTINFO_USERCONFCOMMANDS	13
+
+#ifndef _LOCORE
+
+struct btinfo_common {
+	int len;
+	int type;
+};
+
+struct btinfo_bootpath {
+	struct btinfo_common common;
+	char bootpath[80];
+};
+
+struct btinfo_rootdevice {
+	struct btinfo_common common;
+	char devname[16];
+};
+
+struct btinfo_bootdisk {
+	struct btinfo_common common;
+	int labelsector; /* label valid if != -1 */
+	struct {
+		uint16_t type, checksum;
+		char packname[16];
+	} label;
+	int biosdev;
+	int partition;
+};
+
+struct btinfo_bootwedge {
+	struct btinfo_common common;
+	int biosdev;
+	daddr_t startblk;
+	uint64_t nblks;
+	daddr_t matchblk;
+	uint64_t matchnblks;
+	uint8_t matchhash[16];	/* MD5 hash */
+} __packed;
+
+struct btinfo_netif {
+	struct btinfo_common common;
+	char ifname[16];
+	int bus;
+#define BI_BUS_ISA 0
+#define BI_BUS_PCI 1
+	union {
+		unsigned int iobase; /* ISA */
+		unsigned int tag; /* PCI, BIOS format */
+	} addr;
+};
+
+struct btinfo_console {
+	struct btinfo_common common;
+	char devname[16];
+	int addr;
+	int speed;
+};
+
+struct btinfo_symtab {
+	struct btinfo_common common;
+	int nsym;
+	int ssym;
+	int esym;
+};
+
+struct bi_memmap_entry {
+	uint64_t addr;		/* beginning of block */	/* 8 */
+	uint64_t size;		/* size of block */		/* 8 */
+	uint32_t type;		/* type of block */		/* 4 */
+} __packed;				/*	== 20 */
+
+#define	BIM_Memory	1	/* available RAM usable by OS */
+#define	BIM_Reserved	2	/* in use or reserved by the system */
+#define	BIM_ACPI	3	/* ACPI Reclaim memory */
+#define	BIM_NVS		4	/* ACPI NVS memory */
+
+struct btinfo_memmap {
+	struct btinfo_common common;
+	int num;
+	struct bi_memmap_entry entry[1]; /* var len */
+};
+
+#if HAVE_NBTOOL_CONFIG_H
+#include <nbinclude/sys/bootblock.h>
+#else
+#include <sys/bootblock.h>
+#endif /* HAVE_NBTOOL_CONFIG_H */
+
+/*
+ * Structure describing disk info as seen by the BIOS.
+ */
+struct bi_biosgeom_entry {
+	int		sec, head, cyl;		/* geometry */
+	uint64_t	totsec;			/* LBA sectors from ext int13 */
+	int		flags, dev;		/* flags, BIOS device # */
+#define BI_GEOM_INVALID		0x000001
+#define BI_GEOM_EXTINT13	0x000002
+#ifdef BIOSDISK_EXTINFO_V3
+#define BI_GEOM_BADCKSUM	0x000004	/* v3.x checksum invalid */
+#define BI_GEOM_BUS_MASK	0x00ff00	/* connecting bus type */
+#define BI_GEOM_BUS_ISA		0x000100
+#define BI_GEOM_BUS_PCI		0x000200
+#define BI_GEOM_BUS_OTHER	0x00ff00
+#define BI_GEOM_IFACE_MASK	0xff0000	/* interface type */
+#define BI_GEOM_IFACE_ATA	0x010000
+#define BI_GEOM_IFACE_ATAPI	0x020000
+#define BI_GEOM_IFACE_SCSI	0x030000
+#define BI_GEOM_IFACE_USB	0x040000
+#define BI_GEOM_IFACE_1394	0x050000	/* Firewire */
+#define BI_GEOM_IFACE_FIBRE	0x060000	/* Fibre channel */
+#define BI_GEOM_IFACE_OTHER	0xff0000
+	unsigned int	cksum;			/* MBR checksum */
+	unsigned int	interface_path;		/* ISA iobase PCI bus/dev/fun */
+	uint64_t	device_path;
+	int		res0;			/* future expansion; 0 now */
+#else
+	unsigned int	cksum;			/* MBR checksum */
+	int		res0, res1, res2, res3;	/* future expansion; 0 now */
+#endif
+	struct mbr_partition dosparts[MBR_PART_COUNT]; /* MBR itself */
+} __packed;
+
+struct btinfo_biosgeom {
+	struct btinfo_common common;
+	int num;
+	struct bi_biosgeom_entry disk[1]; /* var len */
+};
+
+struct bi_modulelist_entry {
+	char path[80];
+	int type;
+	int len;
+	uint32_t base;
+};
+#define	BI_MODULE_NONE		0x00
+#define	BI_MODULE_ELF		0x01
+#define	BI_MODULE_IMAGE		0x02
+#define BI_MODULE_RND		0x03
+
+struct btinfo_modulelist {
+	struct btinfo_common common;
+	int num;
+	uint32_t endpa;
+	/* bi_modulelist_entry list follows */
+};
+
+struct btinfo_framebuffer {
+	struct btinfo_common common;
+	uint64_t physaddr;
+	uint32_t flags;
+	uint32_t width;
+	uint32_t height;
+	uint16_t stride;
+	uint8_t depth;
+	uint8_t rnum;
+	uint8_t gnum;
+	uint8_t bnum;
+	uint8_t rpos;
+	uint8_t gpos;
+	uint8_t bpos;
+	uint16_t vbemode;
+	uint8_t reserved[14];
+};
+
+struct bi_userconfcommand {
+	char text[80];
+};
+
+struct btinfo_userconfcommands {
+	struct btinfo_common common;
+	int num;
+	/* bi_userconfcommand list follows */
+};
+
+#endif /* _LOCORE */
+
+#ifdef _KERNEL
+
+#define BOOTINFO_MAXSIZE 4096
+
+#ifndef _LOCORE
+/*
+ * Structure that holds the information passed by the boot loader.
+ */
+struct bootinfo {
+	/* Number of bootinfo_* entries in bi_data. */
+	uint32_t	bi_nentries;
+
+	/* Raw data of bootinfo entries.  The first one (if any) is
+	 * found at bi_data[0] and can be casted to (bootinfo_common *).
+	 * Once this is done, the following entry is found at 'len'
+	 * offset as specified by the previous entry. */
+	uint8_t		bi_data[BOOTINFO_MAXSIZE - sizeof(uint32_t)];
+};
+
+extern struct bootinfo bootinfo;
+
+void *lookup_bootinfo(int);
+#endif /* _LOCORE */
+
+#endif /* _KERNEL */
--- a/sys/arch/x86/include/cpu.h
+++ b/sys/arch/x86/include/cpu.h
@@ -0,0 +1,516 @@
+/*	$NetBSD: cpu.h,v 1.45 2011/12/30 17:57:49 cherry Exp $	*/
+
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * William Jolitz.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)cpu.h	5.4 (Berkeley) 5/9/91
+ */
+
+#ifndef _X86_CPU_H_
+#define _X86_CPU_H_
+
+#if defined(_KERNEL) || defined(_STANDALONE)
+#include <sys/types.h>
+#else
+#include <stdbool.h>
+#endif /* _KERNEL || _STANDALONE */
+
+#if defined(_KERNEL) || defined(_KMEMUSER)
+#if defined(_KERNEL_OPT)
+#include "opt_xen.h"
+#ifdef i386
+#include "opt_user_ldt.h"
+#include "opt_vm86.h"
+#endif
+#endif
+
+/*
+ * Definitions unique to x86 cpu support.
+ */
+#include <machine/frame.h>
+#include <machine/pte.h>
+#include <machine/segments.h>
+#include <machine/tss.h>
+#include <machine/intrdefs.h>
+
+#include <x86/cacheinfo.h>
+
+#include <sys/cpu_data.h>
+#include <sys/evcnt.h>
+#include <sys/device_if.h> /* for device_t */
+
+#ifdef XEN
+#include <xen/xen-public/xen.h>
+#include <xen/xen-public/event_channel.h>
+#endif /* XEN */
+
+struct intrsource;
+struct pmap;
+struct device;
+
+#ifdef __x86_64__
+#define	i386tss	x86_64_tss
+#endif
+
+#define	NIOPORTS	1024		/* # of ports we allow to be mapped */
+#define	IOMAPSIZE	(NIOPORTS / 8)	/* I/O bitmap size in bytes */
+
+/*
+ * a bunch of this belongs in cpuvar.h; move it later..
+ */
+
+struct cpu_info {
+	struct cpu_data ci_data;	/* MI per-cpu data */
+	device_t ci_dev;		/* pointer to our device */
+	struct cpu_info *ci_self;	/* self-pointer */
+	volatile struct vcpu_info *ci_vcpu; /* for XEN */
+	void	*ci_tlog_base;		/* Trap log base */
+	int32_t ci_tlog_offset;		/* Trap log current offset */
+
+	/*
+	 * Will be accessed by other CPUs.
+	 */
+	struct cpu_info *ci_next;	/* next cpu */
+	struct lwp *ci_curlwp;		/* current owner of the processor */
+	struct lwp *ci_fpcurlwp;	/* current owner of the FPU */
+	int	ci_fpsaving;		/* save in progress */
+	int	ci_fpused;		/* XEN: FPU was used by curlwp */
+	cpuid_t ci_cpuid;		/* our CPU ID */
+	int	ci_cpumask;		/* (1 << CPU ID) */
+	uint32_t ci_acpiid;		/* our ACPI/MADT ID */
+	uint32_t ci_initapicid;		/* our intitial APIC ID */
+
+	/*
+	 * Private members.
+	 */
+	struct evcnt ci_tlb_evcnt;	/* tlb shootdown counter */
+	struct pmap *ci_pmap;		/* current pmap */
+	int ci_need_tlbwait;		/* need to wait for TLB invalidations */
+	int ci_want_pmapload;		/* pmap_load() is needed */
+	volatile int ci_tlbstate;	/* one of TLBSTATE_ states. see below */
+#define	TLBSTATE_VALID	0	/* all user tlbs are valid */
+#define	TLBSTATE_LAZY	1	/* tlbs are valid but won't be kept uptodate */
+#define	TLBSTATE_STALE	2	/* we might have stale user tlbs */
+	int ci_curldt;		/* current LDT descriptor */
+	int ci_nintrhand;	/* number of H/W interrupt handlers */
+	uint64_t ci_scratch;
+	uintptr_t ci_pmap_data[128 / sizeof(uintptr_t)];
+
+#ifdef XEN
+	struct iplsource  *ci_isources[NIPL];
+	u_long ci_evtmask[NR_EVENT_CHANNELS]; /* events allowed on this CPU */
+#else
+	struct intrsource *ci_isources[MAX_INTR_SOURCES];
+#endif
+	volatile int	ci_mtx_count;	/* Negative count of spin mutexes */
+	volatile int	ci_mtx_oldspl;	/* Old SPL at this ci_idepth */
+
+	/* The following must be aligned for cmpxchg8b. */
+	struct {
+		uint32_t	ipending;
+		int		ilevel;
+	} ci_istate __aligned(8);
+#define ci_ipending	ci_istate.ipending
+#define	ci_ilevel	ci_istate.ilevel
+
+	int		ci_idepth;
+	void *		ci_intrstack;
+	uint32_t	ci_imask[NIPL];
+	uint32_t	ci_iunmask[NIPL];
+
+	uint32_t ci_flags;		/* flags; see below */
+	uint32_t ci_ipis;		/* interprocessor interrupts pending */
+	uint32_t sc_apic_version;	/* local APIC version */
+
+	uint32_t	ci_signature;	 /* X86 cpuid type */
+	uint32_t	ci_vendor[4];	 /* vendor string */
+	uint32_t	ci_cpu_serial[3]; /* PIII serial number */
+	volatile uint32_t	ci_lapic_counter;
+
+	uint32_t	ci_feat_val[5]; /* X86 CPUID feature bits
+					 *	[0] basic features %edx
+					 *	[1] basic features %ecx
+					 *	[2] extended features %edx
+					 *	[3] extended features %ecx
+					 *	[4] VIA padlock features
+					 */
+	
+	const struct cpu_functions *ci_func;  /* start/stop functions */
+	struct trapframe *ci_ddb_regs;
+
+	u_int ci_cflush_lsize;	/* CFLUSH insn line size */
+	struct x86_cache_info ci_cinfo[CAI_COUNT];
+
+	union descriptor *ci_gdt;
+
+#ifdef i386
+	struct i386tss	ci_doubleflt_tss;
+	struct i386tss	ci_ddbipi_tss;
+#endif
+
+#ifdef PAE
+	uint32_t	ci_pae_l3_pdirpa; /* PA of L3 PD */
+	pd_entry_t *	ci_pae_l3_pdir; /* VA pointer to L3 PD */
+#endif
+
+#if defined(XEN) && (defined(PAE) || defined(__x86_64__))
+	/* Currently active user PGD (can't use rcr3() with Xen) */
+	pd_entry_t *	ci_kpm_pdir;	/* per-cpu PMD (va) */
+	paddr_t		ci_kpm_pdirpa; /* per-cpu PMD (pa) */
+#if defined(__x86_64__)
+	paddr_t		ci_xen_current_user_pgd;
+#endif /* __x86_64__ */
+#endif /* XEN et.al */
+
+
+	char *ci_doubleflt_stack;
+	char *ci_ddbipi_stack;
+
+#ifndef XEN
+	struct evcnt ci_ipi_events[X86_NIPI];
+#else   /* XEN */
+	struct evcnt ci_ipi_events[XEN_NIPIS];
+	evtchn_port_t ci_ipi_evtchn;
+#endif  /* XEN */
+
+	device_t	ci_frequency;	/* Frequency scaling technology */
+	device_t	ci_padlock;	/* VIA PadLock private storage */
+	device_t	ci_temperature;	/* Intel coretemp(4) or equivalent */
+	device_t	ci_vm;		/* Virtual machine guest driver */
+
+	struct i386tss	ci_tss;		/* Per-cpu TSS; shared among LWPs */
+	char		ci_iomap[IOMAPSIZE]; /* I/O Bitmap */
+	int ci_tss_sel;			/* TSS selector of this cpu */
+
+	/*
+	 * The following two are actually region_descriptors,
+	 * but that would pollute the namespace.
+	 */
+	uintptr_t	ci_suspend_gdt;
+	uint16_t	ci_suspend_gdt_padding;
+	uintptr_t	ci_suspend_idt;
+	uint16_t	ci_suspend_idt_padding;
+
+	uint16_t	ci_suspend_tr;
+	uint16_t	ci_suspend_ldt;
+	uintptr_t	ci_suspend_fs;
+	uintptr_t	ci_suspend_gs;
+	uintptr_t	ci_suspend_kgs;
+	uintptr_t	ci_suspend_efer;
+	uintptr_t	ci_suspend_reg[12];
+	uintptr_t	ci_suspend_cr0;
+	uintptr_t	ci_suspend_cr2;
+	uintptr_t	ci_suspend_cr3;
+	uintptr_t	ci_suspend_cr4;
+	uintptr_t	ci_suspend_cr8;
+
+	/* The following must be in a single cache line. */
+	int		ci_want_resched __aligned(64);
+	int		ci_padout __aligned(64);
+};
+
+/*
+ * Macros to handle (some) trapframe registers for common x86 code.
+ */
+#ifdef __x86_64__
+#define	X86_TF_RAX(tf)		tf->tf_rax
+#define	X86_TF_RDX(tf)		tf->tf_rdx
+#define	X86_TF_RSP(tf)		tf->tf_rsp
+#define	X86_TF_RIP(tf)		tf->tf_rip
+#define	X86_TF_RFLAGS(tf)	tf->tf_rflags
+#else
+#define	X86_TF_RAX(tf)		tf->tf_eax
+#define	X86_TF_RDX(tf)		tf->tf_edx
+#define	X86_TF_RSP(tf)		tf->tf_esp
+#define	X86_TF_RIP(tf)		tf->tf_eip
+#define	X86_TF_RFLAGS(tf)	tf->tf_eflags
+#endif
+
+/*
+ * Processor flag notes: The "primary" CPU has certain MI-defined
+ * roles (mostly relating to hardclock handling); we distinguish
+ * betwen the processor which booted us, and the processor currently
+ * holding the "primary" role just to give us the flexibility later to
+ * change primaries should we be sufficiently twisted.
+ */
+
+#define	CPUF_BSP	0x0001		/* CPU is the original BSP */
+#define	CPUF_AP		0x0002		/* CPU is an AP */
+#define	CPUF_SP		0x0004		/* CPU is only processor */
+#define	CPUF_PRIMARY	0x0008		/* CPU is active primary processor */
+
+#define	CPUF_SYNCTSC	0x0800		/* Synchronize TSC */
+#define	CPUF_PRESENT	0x1000		/* CPU is present */
+#define	CPUF_RUNNING	0x2000		/* CPU is running */
+#define	CPUF_PAUSE	0x4000		/* CPU is paused in DDB */
+#define	CPUF_GO		0x8000		/* CPU should start running */
+
+#endif /* _KERNEL || __KMEMUSER */
+
+#ifdef _KERNEL
+/*
+ * We statically allocate the CPU info for the primary CPU (or,
+ * the only CPU on uniprocessors), and the primary CPU is the
+ * first CPU on the CPU info list.
+ */
+extern struct cpu_info cpu_info_primary;
+extern struct cpu_info *cpu_info_list;
+
+#define	CPU_INFO_ITERATOR		int
+#define	CPU_INFO_FOREACH(cii, ci)	cii = 0, ci = cpu_info_list; \
+					ci != NULL; ci = ci->ci_next
+
+#define CPU_STARTUP(_ci, _target)	((_ci)->ci_func->start(_ci, _target))
+#define CPU_STOP(_ci)	        	((_ci)->ci_func->stop(_ci))
+#define CPU_START_CLEANUP(_ci)		((_ci)->ci_func->cleanup(_ci))
+
+#if !defined(__GNUC__) || defined(_MODULE)
+/* For non-GCC and modules */
+struct cpu_info	*x86_curcpu(void);
+void	cpu_set_curpri(int);
+# ifdef __GNUC__
+lwp_t	*x86_curlwp(void) __attribute__ ((const));
+# else
+lwp_t   *x86_curlwp(void);
+# endif
+#endif
+
+#define cpu_number() 		(cpu_index(curcpu()))
+
+#define CPU_IS_PRIMARY(ci)	((ci)->ci_flags & CPUF_PRIMARY)
+
+#define	X86_AST_GENERIC		0x01
+#define	X86_AST_PREEMPT		0x02
+
+#define aston(l, why)		((l)->l_md.md_astpending |= (why))
+#define	cpu_did_resched(l)	((l)->l_md.md_astpending &= ~X86_AST_PREEMPT)
+
+void cpu_boot_secondary_processors(void);
+void cpu_init_idle_lwps(void);
+void cpu_init_msrs(struct cpu_info *, bool);
+void cpu_load_pmap(struct pmap *);
+void cpu_broadcast_halt(void);
+void cpu_kick(struct cpu_info *);
+
+extern uint32_t cpus_attached;
+
+#define	curcpu()		x86_curcpu()
+#define	curlwp			x86_curlwp()
+#define	curpcb			((struct pcb *)lwp_getpcb(curlwp))
+
+/*
+ * Arguments to hardclock, softclock and statclock
+ * encapsulate the previous machine state in an opaque
+ * clockframe; for now, use generic intrframe.
+ */
+struct clockframe {
+	struct intrframe cf_if;
+};
+
+/*
+ * Give a profiling tick to the current process when the user profiling
+ * buffer pages are invalid.  On the i386, request an ast to send us
+ * through trap(), marking the proc as needing a profiling tick.
+ */
+extern void	cpu_need_proftick(struct lwp *l);
+
+/*
+ * Notify the LWP l that it has a signal pending, process as soon as
+ * possible.
+ */
+extern void	cpu_signotify(struct lwp *);
+
+/*
+ * We need a machine-independent name for this.
+ */
+extern void (*delay_func)(unsigned int);
+struct timeval;
+
+#define	DELAY(x)		(*delay_func)(x)
+#define delay(x)		(*delay_func)(x)
+
+extern int biosbasemem;
+extern int biosextmem;
+extern int cpu;
+extern int cpuid_level;
+extern int cpu_class;
+extern char cpu_brand_string[];
+extern int use_pae;
+
+extern int i386_use_fxsave;
+extern int i386_has_sse;
+extern int i386_has_sse2;
+
+extern void (*x86_cpu_idle)(void);
+#define	cpu_idle() (*x86_cpu_idle)()
+
+/* machdep.c */
+void	dumpconf(void);
+void	cpu_reset(void);
+void	i386_proc0_tss_ldt_init(void);
+void	dumpconf(void);
+void	cpu_reset(void);
+void	x86_64_proc0_tss_ldt_init(void);
+void	x86_64_init_pcb_tss_ldt(struct cpu_info *);
+
+/* longrun.c */
+u_int 	tmx86_get_longrun_mode(void);
+void 	tmx86_get_longrun_status(u_int *, u_int *, u_int *);
+void 	tmx86_init_longrun(void);
+
+/* identcpu.c */
+void 	cpu_probe(struct cpu_info *);
+void	cpu_identify(struct cpu_info *);
+
+/* cpu_topology.c */
+void	x86_cpu_topology(struct cpu_info *);
+
+/* vm_machdep.c */
+void	cpu_proc_fork(struct proc *, struct proc *);
+
+/* locore.s */
+struct region_descriptor;
+void	lgdt(struct region_descriptor *);
+#ifdef XEN
+void	lgdt_finish(void);
+void	i386_switch_context(lwp_t *);
+#endif
+
+struct pcb;
+void	savectx(struct pcb *);
+void	lwp_trampoline(void);
+void	child_trampoline(void);
+#ifdef XEN
+void	startrtclock(void);
+void	xen_delay(unsigned int);
+void	xen_initclocks(void);
+void	xen_suspendclocks(void);
+void	xen_resumeclocks(void);
+#else
+/* clock.c */
+void	initrtclock(u_long);
+void	startrtclock(void);
+void	i8254_delay(unsigned int);
+void	i8254_microtime(struct timeval *);
+void	i8254_initclocks(void);
+#endif
+
+/* cpu.c */
+
+void	cpu_probe_features(struct cpu_info *);
+
+/* npx.c */
+void	npxsave_lwp(struct lwp *, bool);
+void	npxsave_cpu(bool);
+
+/* vm_machdep.c */
+paddr_t	kvtop(void *);
+
+#ifdef USER_LDT
+/* sys_machdep.h */
+int	x86_get_ldt(struct lwp *, void *, register_t *);
+int	x86_set_ldt(struct lwp *, void *, register_t *);
+#endif
+
+/* isa_machdep.c */
+void	isa_defaultirq(void);
+int	isa_nmi(void);
+
+#ifdef VM86
+/* vm86.c */
+void	vm86_gpfault(struct lwp *, int);
+#endif /* VM86 */
+
+/* consinit.c */
+void kgdb_port_init(void);
+
+/* bus_machdep.c */
+void x86_bus_space_init(void);
+void x86_bus_space_mallocok(void);
+
+#endif /* _KERNEL */
+
+#if defined(_KERNEL) || defined(_KMEMUSER)
+#include <machine/psl.h>	/* Must be after struct cpu_info declaration */
+#endif /* _KERNEL || __KMEMUSER */
+
+/*
+ * CTL_MACHDEP definitions.
+ */
+#define	CPU_CONSDEV		1	/* dev_t: console terminal device */
+#define	CPU_BIOSBASEMEM		2	/* int: bios-reported base mem (K) */
+#define	CPU_BIOSEXTMEM		3	/* int: bios-reported ext. mem (K) */
+/* 	CPU_NKPDE		4	obsolete: int: number of kernel PDEs */
+#define	CPU_BOOTED_KERNEL	5	/* string: booted kernel name */
+#define CPU_DISKINFO		6	/* struct disklist *:
+					 * disk geometry information */
+#define CPU_FPU_PRESENT		7	/* int: FPU is present */
+#define	CPU_OSFXSR		8	/* int: OS uses FXSAVE/FXRSTOR */
+#define	CPU_SSE			9	/* int: OS/CPU supports SSE */
+#define	CPU_SSE2		10	/* int: OS/CPU supports SSE2 */
+#define	CPU_TMLR_MODE		11	/* int: longrun mode
+					 * 0: minimum frequency
+					 * 1: economy
+					 * 2: performance
+					 * 3: maximum frequency
+					 */
+#define	CPU_TMLR_FREQUENCY	12	/* int: current frequency */
+#define	CPU_TMLR_VOLTAGE	13	/* int: curret voltage */
+#define	CPU_TMLR_PERCENTAGE	14	/* int: current clock percentage */
+#define	CPU_MAXID		15	/* number of valid machdep ids */
+
+/*
+ * Structure for CPU_DISKINFO sysctl call.
+ * XXX this should be somewhere else.
+ */
+#define MAX_BIOSDISKS	16
+
+struct disklist {
+	int dl_nbiosdisks;			   /* number of bios disks */
+	struct biosdisk_info {
+		int bi_dev;			   /* BIOS device # (0x80 ..) */
+		int bi_cyl;			   /* cylinders on disk */
+		int bi_head;			   /* heads per track */
+		int bi_sec;			   /* sectors per track */
+		uint64_t bi_lbasecs;		   /* total sec. (iff ext13) */
+#define BIFLAG_INVALID		0x01
+#define BIFLAG_EXTINT13		0x02
+		int bi_flags;
+	} dl_biosdisks[MAX_BIOSDISKS];
+
+	int dl_nnativedisks;			   /* number of native disks */
+	struct nativedisk_info {
+		char ni_devname[16];		   /* native device name */
+		int ni_nmatches; 		   /* # of matches w/ BIOS */
+		int ni_biosmatches[MAX_BIOSDISKS]; /* indices in dl_biosdisks */
+	} dl_nativedisks[1];			   /* actually longer */
+};
+#endif /* !_X86_CPU_H_ */
--- a/sys/arch/x86/include/loadfile_machdep.h
+++ b/sys/arch/x86/include/loadfile_machdep.h
@@ -0,0 +1,82 @@
+/*	$NetBSD: loadfile_machdep.h,v 1.4 2009/03/21 15:01:56 ad Exp $	 */
+
+/*-
+ * Copyright (c) 1998, 2007, 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define BOOT_ELF32
+#define BOOT_ELF64
+
+#define LOAD_KERNEL	(LOAD_ALL & ~LOAD_TEXTA)
+#define COUNT_KERNEL	(COUNT_ALL & ~COUNT_TEXTA)
+
+#ifdef _STANDALONE
+
+#define LOADADDR(a)		((((u_long)(a)) & 0x07ffffff) + offset)
+#define ALIGNENTRY(a)		((u_long)(a) & 0x00100000)
+#define READ(f, b, c)		pread((f), (void *)LOADADDR(b), (c))
+#define BCOPY(s, d, c)		vpbcopy((s), (void *)LOADADDR(d), (c))
+#define BZERO(d, c)		pbzero((void *)LOADADDR(d), (c))
+#define	WARN(a)			(void)(printf a, \
+				    printf((errno ? ": %s\n" : "\n"), \
+				    strerror(errno)))
+#define PROGRESS(a)		x86_progress a
+#define ALLOC(a)		alloc(a)
+#define DEALLOC(a, b)		dealloc(a, b)
+#define OKMAGIC(a)		((a) == ZMAGIC)
+
+void x86_progress(const char *, ...);
+void vpbcopy(const void *, void *, size_t);
+void pbzero(void *, size_t);
+ssize_t pread(int, void *, size_t);
+
+#else
+#ifdef TEST
+#define LOADADDR(a)		offset
+#define READ(f, b, c)		c
+#define BCOPY(s, d, c)	
+#define BZERO(d, c)	
+#define PROGRESS(a)		(void) printf a
+#else
+#define LOADADDR(a)		(((u_long)(a)) + offset)
+#define READ(f, b, c)		read((f), (void *)LOADADDR(b), (c))
+#define BCOPY(s, d, c)		memcpy((void *)LOADADDR(d), (void *)(s), (c))
+#define BZERO(d, c)		memset((void *)LOADADDR(d), 0, (c))
+#define PROGRESS(a)		/* nothing */
+#endif
+#define WARN(a)			warn a
+#define ALIGNENTRY(a)		((u_long)(a))
+#define ALLOC(a)		malloc(a)
+#define DEALLOC(a, b)		free(a)
+#define OKMAGIC(a)		((a) == OMAGIC)
+
+ssize_t vread(int, u_long, u_long *, size_t);
+void vcopy(u_long, u_long, u_long *, size_t);
+void vzero(u_long, u_long *, size_t);
+
+#endif
--- a/sys/arch/x86/include/pio.h
+++ b/sys/arch/x86/include/pio.h
@@ -0,0 +1,53 @@
+/*	$NetBSD: pio.h,v 1.9 2011/05/22 16:01:43 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles M. Hannum.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _X86_PIO_H_
+#define _X86_PIO_H_
+
+/*
+ * Functions to provide access to x86 programmed I/O instructions.
+ */
+
+uint8_t		inb(unsigned);
+void		insb(unsigned, void *, int);
+uint16_t	inw(unsigned);
+void		insw(unsigned, void *, int);
+uint32_t	inl(unsigned);
+void		insl(unsigned, void *, int);
+
+void		outb(unsigned, uint8_t);
+void		outsb(unsigned, void *, int);
+void		outw(unsigned, uint16_t);
+void		outsw(unsigned, void *, int);
+void		outl(unsigned, uint32_t);
+void		outsl(unsigned, void *, int);
+	
+#endif /* _X86_PIO_H_ */
--- a/sys/arch/x86/include/rwlock.h
+++ b/sys/arch/x86/include/rwlock.h
@@ -0,0 +1,62 @@
+/*	$NetBSD: rwlock.h,v 1.5 2008/04/28 20:23:40 martin Exp $	*/
+
+/*-
+ * Copyright (c) 2002, 2006 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe and Andrew Doran.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _X86_RWLOCK_H_
+#define	_X86_RWLOCK_H_
+
+struct krwlock {
+	volatile uintptr_t	rw_owner;
+};
+
+#ifdef __RWLOCK_PRIVATE
+
+#define	__HAVE_SIMPLE_RW_LOCKS		1
+#define	__HAVE_RW_STUBS			1
+
+/*
+ * RW_RECEIVE: no memory barrier required, as 'ret' implies a load fence. 
+ */
+#define	RW_RECEIVE(rw)			/* nothing */
+
+/*
+ * RW_GIVE: no memory barrier required, as _lock_cas() will take care of it.
+ */
+#define	RW_GIVE(rw)			/* nothing */
+
+#define	RW_CAS(p, o, n)			\
+    (_atomic_cas_ulong((volatile unsigned long *)(p), (o), (n)) == (o))
+
+unsigned long	_atomic_cas_ulong(volatile unsigned long *,
+    unsigned long, unsigned long);
+
+#endif	/* __RWLOCK_PRIVATE */
+
+#endif /* _X86_RWLOCK_H_ */