Add IFA_STATS to ALLsdiff -r1.38 -r1.39 src/sys/arch/amd64/conf/ALL
(ozaki-r)
--- src/sys/arch/amd64/conf/ALL 2016/08/07 10:44:05 1.38
+++ src/sys/arch/amd64/conf/ALL 2016/10/11 05:16:04 1.39
@@ -1,33 +1,33 @@ | @@ -1,33 +1,33 @@ | |||
1 | # $NetBSD: ALL,v 1.38 2016/08/07 10:44:05 christos Exp $ | 1 | # $NetBSD: ALL,v 1.39 2016/10/11 05:16:04 ozaki-r Exp $ | |
2 | # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp | 2 | # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp | |
3 | # | 3 | # | |
4 | # ALL machine description file | 4 | # ALL machine description file | |
5 | # | 5 | # | |
6 | # This machine description includes all devices and options and it is | 6 | # This machine description includes all devices and options and it is | |
7 | # used to compile-test the source and does not necessarily produce a | 7 | # used to compile-test the source and does not necessarily produce a | |
8 | # bootable or useful kernel. | 8 | # bootable or useful kernel. | |
9 | # | 9 | # | |
10 | # For further information on hardware support for this architecture, see | 10 | # For further information on hardware support for this architecture, see | |
11 | # the intro(4) man page. For further information about kernel options | 11 | # the intro(4) man page. For further information about kernel options | |
12 | # for this architecture, see the options(4) man page. For an explanation | 12 | # for this architecture, see the options(4) man page. For an explanation | |
13 | # of each device driver in this file see the section 4 man page for the | 13 | # of each device driver in this file see the section 4 man page for the | |
14 | # device. | 14 | # device. | |
15 | 15 | |||
16 | include "arch/amd64/conf/std.amd64" | 16 | include "arch/amd64/conf/std.amd64" | |
17 | 17 | |||
18 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | 18 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | |
19 | 19 | |||
20 | #ident "ALL-$Revision: 1.38 $" | 20 | #ident "ALL-$Revision: 1.39 $" | |
21 | 21 | |||
22 | maxusers 64 # estimated number of users | 22 | maxusers 64 # estimated number of users | |
23 | 23 | |||
24 | makeoptions USE_SSP=yes | 24 | makeoptions USE_SSP=yes | |
25 | 25 | |||
26 | # CPU-related options. | 26 | # CPU-related options. | |
27 | #options VM86 # virtual 8086 emulation | 27 | #options VM86 # virtual 8086 emulation | |
28 | #options USER_LDT # user-settable LDT; used by WINE | 28 | #options USER_LDT # user-settable LDT; used by WINE | |
29 | options X86EMU # 386 Real Mode emulator | 29 | options X86EMU # 386 Real Mode emulator | |
30 | #options PAE # PAE mode (36 bits physical addressing) | 30 | #options PAE # PAE mode (36 bits physical addressing) | |
31 | 31 | |||
32 | # CPU features | 32 | # CPU features | |
33 | acpicpu* at cpu? # ACPI CPU (including frequency scaling) | 33 | acpicpu* at cpu? # ACPI CPU (including frequency scaling) | |
@@ -1973,26 +1973,27 @@ options HPC_DEBUG_LCD | @@ -1973,26 +1973,27 @@ options HPC_DEBUG_LCD | |||
1973 | options HP_DEBUG | 1973 | options HP_DEBUG | |
1974 | options HSCXADEBUG | 1974 | options HSCXADEBUG | |
1975 | options HSCXBDEBUG | 1975 | options HSCXBDEBUG | |
1976 | options I2ODEBUG | 1976 | options I2ODEBUG | |
1977 | options I4BISPPPDEBUG | 1977 | options I4BISPPPDEBUG | |
1978 | options I4B_MBUF_DEBUG | 1978 | options I4B_MBUF_DEBUG | |
1979 | options I4B_MBUF_TYPE_DEBUG | 1979 | options I4B_MBUF_TYPE_DEBUG | |
1980 | options IBCS2_DEBUG | 1980 | options IBCS2_DEBUG | |
1981 | options ICONV_DEBUG | 1981 | options ICONV_DEBUG | |
1982 | options ICP_DEBUG | 1982 | options ICP_DEBUG | |
1983 | options IEDEBUG | 1983 | options IEDEBUG | |
1984 | options IEEE80211_DEBUG_REFCNT | 1984 | options IEEE80211_DEBUG_REFCNT | |
1985 | options IFAREF_DEBUG | 1985 | options IFAREF_DEBUG | |
1986 | options IFA_STATS | |||
1986 | options IFMEDIA_DEBUG | 1987 | options IFMEDIA_DEBUG | |
1987 | options IHA_DEBUG_STATE | 1988 | options IHA_DEBUG_STATE | |
1988 | options INTRDEBUG | 1989 | options INTRDEBUG | |
1989 | options INTR_DEBUG | 1990 | options INTR_DEBUG | |
1990 | options IPAQ_LCD_DEBUG | 1991 | options IPAQ_LCD_DEBUG | |
1991 | options IPF_DEBUG | 1992 | options IPF_DEBUG | |
1992 | options IPSEC_DEBUG | 1993 | options IPSEC_DEBUG | |
1993 | options IPW_DEBUG | 1994 | options IPW_DEBUG | |
1994 | options IP_RCMD_PROXY_DEBUG | 1995 | options IP_RCMD_PROXY_DEBUG | |
1995 | options IRFRAMET_DEBUG | 1996 | options IRFRAMET_DEBUG | |
1996 | options IRFRAME_DEBUG | 1997 | options IRFRAME_DEBUG | |
1997 | options IRQ_DEBUG | 1998 | options IRQ_DEBUG | |
1998 | options ISACDEBUG | 1999 | options ISACDEBUG |
--- src/sys/arch/i386/conf/ALL 2016/08/07 10:44:05 1.401
+++ src/sys/arch/i386/conf/ALL 2016/10/11 05:16:04 1.402
@@ -1,33 +1,33 @@ | @@ -1,33 +1,33 @@ | |||
1 | # $NetBSD: ALL,v 1.401 2016/08/07 10:44:05 christos Exp $ | 1 | # $NetBSD: ALL,v 1.402 2016/10/11 05:16:04 ozaki-r Exp $ | |
2 | # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp | 2 | # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp | |
3 | # | 3 | # | |
4 | # ALL machine description file | 4 | # ALL machine description file | |
5 | # | 5 | # | |
6 | # This machine description includes all devices and options and it is | 6 | # This machine description includes all devices and options and it is | |
7 | # used to compile-test the source and does not necessarily produce a | 7 | # used to compile-test the source and does not necessarily produce a | |
8 | # bootable or useful kernel. | 8 | # bootable or useful kernel. | |
9 | # | 9 | # | |
10 | # For further information on hardware support for this architecture, see | 10 | # For further information on hardware support for this architecture, see | |
11 | # the intro(4) man page. For further information about kernel options | 11 | # the intro(4) man page. For further information about kernel options | |
12 | # for this architecture, see the options(4) man page. For an explanation | 12 | # for this architecture, see the options(4) man page. For an explanation | |
13 | # of each device driver in this file see the section 4 man page for the | 13 | # of each device driver in this file see the section 4 man page for the | |
14 | # device. | 14 | # device. | |
15 | 15 | |||
16 | include "arch/i386/conf/std.i386" | 16 | include "arch/i386/conf/std.i386" | |
17 | 17 | |||
18 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | 18 | options INCLUDE_CONFIG_FILE # embed config file in kernel binary | |
19 | 19 | |||
20 | #ident "ALL-$Revision: 1.401 $" | 20 | #ident "ALL-$Revision: 1.402 $" | |
21 | 21 | |||
22 | maxusers 64 # estimated number of users | 22 | maxusers 64 # estimated number of users | |
23 | 23 | |||
24 | makeoptions USE_SSP=yes | 24 | makeoptions USE_SSP=yes | |
25 | 25 | |||
26 | # CPU-related options. | 26 | # CPU-related options. | |
27 | options VM86 # virtual 8086 emulation | 27 | options VM86 # virtual 8086 emulation | |
28 | options USER_LDT # user-settable LDT; used by WINE | 28 | options USER_LDT # user-settable LDT; used by WINE | |
29 | options X86EMU # 386 Real Mode emulator | 29 | options X86EMU # 386 Real Mode emulator | |
30 | options PAE # PAE mode (36 bits physical addressing) | 30 | options PAE # PAE mode (36 bits physical addressing) | |
31 | 31 | |||
32 | # CPU features | 32 | # CPU features | |
33 | acpicpu* at cpu? # ACPI CPU (including frequency scaling) | 33 | acpicpu* at cpu? # ACPI CPU (including frequency scaling) | |
@@ -2175,26 +2175,27 @@ options HPC_DEBUG_LCD | @@ -2175,26 +2175,27 @@ options HPC_DEBUG_LCD | |||
2175 | options HP_DEBUG | 2175 | options HP_DEBUG | |
2176 | options HSCXADEBUG | 2176 | options HSCXADEBUG | |
2177 | options HSCXBDEBUG | 2177 | options HSCXBDEBUG | |
2178 | options I2ODEBUG | 2178 | options I2ODEBUG | |
2179 | options I4BISPPPDEBUG | 2179 | options I4BISPPPDEBUG | |
2180 | options I4B_MBUF_DEBUG | 2180 | options I4B_MBUF_DEBUG | |
2181 | options I4B_MBUF_TYPE_DEBUG | 2181 | options I4B_MBUF_TYPE_DEBUG | |
2182 | options IBCS2_DEBUG | 2182 | options IBCS2_DEBUG | |
2183 | options ICONV_DEBUG | 2183 | options ICONV_DEBUG | |
2184 | options ICP_DEBUG | 2184 | options ICP_DEBUG | |
2185 | options IEDEBUG | 2185 | options IEDEBUG | |
2186 | options IEEE80211_DEBUG_REFCNT | 2186 | options IEEE80211_DEBUG_REFCNT | |
2187 | options IFAREF_DEBUG | 2187 | options IFAREF_DEBUG | |
2188 | options IFA_STATS | |||
2188 | options IFMEDIA_DEBUG | 2189 | options IFMEDIA_DEBUG | |
2189 | options IHA_DEBUG_STATE | 2190 | options IHA_DEBUG_STATE | |
2190 | options INTRDEBUG | 2191 | options INTRDEBUG | |
2191 | options INTR_DEBUG | 2192 | options INTR_DEBUG | |
2192 | options IPAQ_LCD_DEBUG | 2193 | options IPAQ_LCD_DEBUG | |
2193 | options IPF_DEBUG | 2194 | options IPF_DEBUG | |
2194 | options IPSEC_DEBUG | 2195 | options IPSEC_DEBUG | |
2195 | options IPW_DEBUG | 2196 | options IPW_DEBUG | |
2196 | options IP_RCMD_PROXY_DEBUG | 2197 | options IP_RCMD_PROXY_DEBUG | |
2197 | options IRFRAMET_DEBUG | 2198 | options IRFRAMET_DEBUG | |
2198 | options IRFRAME_DEBUG | 2199 | options IRFRAME_DEBUG | |
2199 | options IRQ_DEBUG | 2200 | options IRQ_DEBUG | |
2200 | options ISACDEBUG | 2201 | options ISACDEBUG |