Module Name: src
Committed By: christos
Date: Mon Jan 23 17:36:17 UTC 2017
Modified Files:
src/sys/arch/i386/conf: XEN3_DOM0 XEN3_DOMU
Log Message:
PR/51908: Kyle Amon: Allow customization of XEN kernels via .local files.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/i386/conf/XEN3_DOMU
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/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.105 src/sys/arch/i386/conf/XEN3_DOM0:1.106
--- src/sys/arch/i386/conf/XEN3_DOM0:1.105 Thu Jan 12 00:24:36 2017
+++ src/sys/arch/i386/conf/XEN3_DOM0 Mon Jan 23 12:36:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.105 2017/01/12 05:24:36 ryo Exp $
+# $NetBSD: XEN3_DOM0,v 1.106 2017/01/23 17:36:16 christos Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -774,6 +774,7 @@ hifn* at pci? dev ? function ? # Hifn 77
ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x
cinclude "arch/i386/conf/GENERIC.local"
+cinclude "arch/i386/conf/XEN3_DOM0.local"
# Pseudo-Devices
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.71 src/sys/arch/i386/conf/XEN3_DOMU:1.72
--- src/sys/arch/i386/conf/XEN3_DOMU:1.71 Thu Jan 12 00:24:36 2017
+++ src/sys/arch/i386/conf/XEN3_DOMU Mon Jan 23 12:36:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.71 2017/01/12 05:24:36 ryo Exp $
+# $NetBSD: XEN3_DOMU,v 1.72 2017/01/23 17:36:16 christos Exp $
include "arch/xen/conf/std.xen"
@@ -197,6 +197,7 @@ xbd* at xenbus? # Xen virtual block de
balloon* at xenbus? # Xen balloon device
cinclude "arch/i386/conf/GENERIC.local"
+cinclude "arch/i386/conf/XEN3_DOMU.local"
# Pseudo-Devices
