Mon Apr 20 19:43:33 2020 UTC ()
Use std.xenversion


(bouyer)
diff -r1.11.26.1 -r1.11.26.2 src/sys/arch/amd64/conf/std.amd64
cvs diff -r1.11.26.1 -r1.11.26.2 src/sys/arch/amd64/conf/std.amd64 (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/std.amd64 2020/04/16 08:46:34 1.11.26.1
+++ src/sys/arch/amd64/conf/std.amd64 2020/04/20 19:43:32 1.11.26.2
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1# $NetBSD: std.amd64,v 1.11.26.1 2020/04/16 08:46:34 bouyer Exp $ 1# $NetBSD: std.amd64,v 1.11.26.2 2020/04/20 19:43:32 bouyer Exp $
2# 2#
3# standard, required NetBSD/amd64 'options' 3# standard, required NetBSD/amd64 'options'
4 4
5machine amd64 x86 xen 5machine amd64 x86 xen
6include "conf/std" # MI standard options 6include "conf/std" # MI standard options
 7include "arch/xen/conf/std.xenversion"
7 8
8options CPU_IN_CKSUM 9options CPU_IN_CKSUM
9options EXEC_ELF64 # exec ELF binaries 10options EXEC_ELF64 # exec ELF binaries
10options EXEC_SCRIPT # exec #! scripts 11options EXEC_SCRIPT # exec #! scripts
11options MTRR 12options MTRR
12options MULTIPROCESSOR 13options MULTIPROCESSOR
13 14
14options CHILD_MAX=1024 # 160 is too few 15options CHILD_MAX=1024 # 160 is too few
15options OPEN_MAX=1024 # 128 is too few 16options OPEN_MAX=1024 # 128 is too few
16 17
17options __XEN_INTERFACE_VERSION__=0x00030208 # Xen 3.1 interface 
18 
19mainbus0 at root 18mainbus0 at root
20cpu* at mainbus? 19cpu* at mainbus?
21ioapic* at mainbus? apid ? 20ioapic* at mainbus? apid ?
22 21
23# Atheros HAL options 22# Atheros HAL options
24include "external/isc/atheros_hal/conf/std.ath_hal" 23include "external/isc/atheros_hal/conf/std.ath_hal"