Module Name: src
Committed By: uebayasi
Date: Sat Oct 11 09:50:03 UTC 2014
Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0 std.xen
Log Message:
Don't include std.ath_hal for XEN3_DOMU.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amd64/conf/std.xen
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/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.108 src/sys/arch/amd64/conf/XEN3_DOM0:1.109
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.108 Fri Sep 19 17:30:03 2014
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Oct 11 09:50:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.108 2014/09/19 17:30:03 christos Exp $
+# $NetBSD: XEN3_DOM0,v 1.109 2014/10/11 09:50:03 uebayasi Exp $
include "arch/amd64/conf/std.xen"
@@ -847,3 +847,6 @@ pseudo-device xbdback
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_ASLR=0 # PaX Address Space Layout Randomization
+
+# Atheros HAL options
+include "external/isc/atheros_hal/conf/std.ath_hal"
Index: src/sys/arch/amd64/conf/std.xen
diff -u src/sys/arch/amd64/conf/std.xen:1.6 src/sys/arch/amd64/conf/std.xen:1.7
--- src/sys/arch/amd64/conf/std.xen:1.6 Wed Jul 29 12:02:05 2009
+++ src/sys/arch/amd64/conf/std.xen Sat Oct 11 09:50:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: std.xen,v 1.6 2009/07/29 12:02:05 cegger Exp $
+# $NetBSD: std.xen,v 1.7 2014/10/11 09:50:03 uebayasi Exp $
# NetBSD: std.i386,v 1.24 2003/02/26 21:33:36 fvdl Exp
#
# standard, required NetBSD/i386 'options'
@@ -13,6 +13,3 @@ options CPU_IN_CKSUM
options EXEC_ELF64 # exec ELF binaries
options EXEC_SCRIPT # exec #! scripts
options MTRR
-
-# Atheros HAL options
-include "external/isc/atheros_hal/conf/std.ath_hal"
