Sun Jan 29 18:55:13 2012 UTC ()
options MALLOC_DEBUG is no longer expected to compile,
but has not yet been removed.  Avoid compiling it here.


(jakllsch)
diff -r1.330 -r1.331 src/sys/arch/i386/conf/ALL
cvs diff -r1.330 -r1.331 src/sys/arch/i386/conf/ALL (expand / switch to unified diff)

--- src/sys/arch/i386/conf/ALL 2012/01/14 12:30:12 1.330
+++ src/sys/arch/i386/conf/ALL 2012/01/29 18:55:12 1.331
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1# $NetBSD: ALL,v 1.330 2012/01/14 12:30:12 tron Exp $ 1# $NetBSD: ALL,v 1.331 2012/01/29 18:55:12 jakllsch 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
16include "arch/i386/conf/std.i386" 16include "arch/i386/conf/std.i386"
17 17
18options INCLUDE_CONFIG_FILE # embed config file in kernel binary 18options INCLUDE_CONFIG_FILE # embed config file in kernel binary
19 19
20#ident "ALL-$Revision: 1.330 $" 20#ident "ALL-$Revision: 1.331 $"
21 21
22maxusers 64 # estimated number of users 22maxusers 64 # estimated number of users
23 23
24makeoptions USE_SSP=yes 24makeoptions USE_SSP=yes
25 25
26# CPU-related options. 26# CPU-related options.
27options VM86 # virtual 8086 emulation 27options VM86 # virtual 8086 emulation
28options USER_LDT # user-settable LDT; used by WINE 28options USER_LDT # user-settable LDT; used by WINE
29options X86EMU # 386 Real Mode emulator 29options X86EMU # 386 Real Mode emulator
30options PAE # PAE mode (36 bits physical addressing) 30options PAE # PAE mode (36 bits physical addressing)
31 31
32# CPU features 32# CPU features
33acpicpu* at cpu? # ACPI CPU (including frequency scaling) 33acpicpu* at cpu? # ACPI CPU (including frequency scaling)
@@ -2126,27 +2126,26 @@ options LANA_DEBUG @@ -2126,27 +2126,26 @@ options LANA_DEBUG
2126options LCD_DEBUG 2126options LCD_DEBUG
2127options LDT_DEBUG 2127options LDT_DEBUG
2128options LEDEBUG 2128options LEDEBUG
2129options LE_DEBUG 2129options LE_DEBUG
2130options LIFDEBUG 2130options LIFDEBUG
2131options LINUX_SG_DEBUG 2131options LINUX_SG_DEBUG
2132options LLCDEBUG 2132options LLCDEBUG
2133options LLC_DEBUG 2133options LLC_DEBUG
2134options LOADER_DEBUG 2134options LOADER_DEBUG
2135options LOAD_DEBUG_INFO 2135options LOAD_DEBUG_INFO
2136options LOCKF_DEBUG 2136options LOCKF_DEBUG
2137options LPT_DEBUG 2137options LPT_DEBUG
2138options MAGMA_DEBUG 2138options MAGMA_DEBUG
2139options MALLOC_DEBUG 
2140options MAPLE_DEBUG 2139options MAPLE_DEBUG
2141options MB8795_DEBUG 2140options MB8795_DEBUG
2142options MCDDEBUG 2141options MCDDEBUG
2143options MCDEBUG 2142options MCDEBUG
2144options MCHAIN_DEBUG 2143options MCHAIN_DEBUG
2145options MEC_DEBUG 2144options MEC_DEBUG
2146options MEDIABAY_DEBUG 2145options MEDIABAY_DEBUG
2147options MEMORY_MAP_DEBUG 2146options MEMORY_MAP_DEBUG
2148options MESH_DEBUG 2147options MESH_DEBUG
2149options MIDI_DEBUG 2148options MIDI_DEBUG
2150options MLYDEBUG 2149options MLYDEBUG
2151options MMEYEPCMCIADEBUG 2150options MMEYEPCMCIADEBUG
2152options MOUSE_DEBUG 2151options MOUSE_DEBUG