From: yasuoka <yasuoka@openbsd.org>
Date: Thu, 8 Oct 2015 22:41:12 +0000 (+0000)
Subject: After replacement alloca() with alloc(), out-of-heap happened when booting
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4af38e7f62c96afb236cddf4be3cd6068c4773b4;p=openbsd

After replacement alloca() with alloc(), out-of-heap happened when booting
on a large block size (32K) partition.  Increase the HEAP_LIMIT from
0x90000 to 0xA0000.

try this, deraadt
---

diff --git a/sys/arch/amd64/stand/Makefile.inc b/sys/arch/amd64/stand/Makefile.inc
index 14fc7f6eabf..4460cf4bdaf 100644
--- a/sys/arch/amd64/stand/Makefile.inc
+++ b/sys/arch/amd64/stand/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.12 2015/09/18 13:30:55 miod Exp $
+#	$OpenBSD: Makefile.inc,v 1.13 2015/10/08 22:41:12 yasuoka Exp $
 
 CFLAGS=${DEBUG} ${COPTS} -Os -Wall -Werror
 CFLAGS+=	-fno-stack-protector -DMDRANDOM
@@ -16,7 +16,7 @@ DEBUGFLAGS=
 # DEBUGFLAGS+=-DNFS_DEBUG -DRPC_DEBUG -DRARP_DEBUG
 LINKADDR=0x40120
 LOADADDR=0x40000
-HEAP_LIMIT=0x90000
+HEAP_LIMIT=0xA0000
 BOOTREL=0x60000
 BOOTMAGIC=0xc001d00d
 #ROM_SIZE=32768
diff --git a/sys/arch/i386/stand/Makefile.inc b/sys/arch/i386/stand/Makefile.inc
index fe16ebfac99..a36faef6bdc 100644
--- a/sys/arch/i386/stand/Makefile.inc
+++ b/sys/arch/i386/stand/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.46 2015/09/18 13:30:56 miod Exp $
+#	$OpenBSD: Makefile.inc,v 1.47 2015/10/08 22:41:12 yasuoka Exp $
 
 CFLAGS=${DEBUG} ${COPTS} -Os -Wall -Werror
 CFLAGS+=	-fno-stack-protector -DMDRANDOM
@@ -16,7 +16,7 @@ DEBUGFLAGS=
 # DEBUGFLAGS+=-DNFS_DEBUG -DRPC_DEBUG -DRARP_DEBUG
 LINKADDR=0x40120
 LOADADDR=0x40000
-HEAP_LIMIT=0x90000
+HEAP_LIMIT=0xA0000
 BOOTREL=0x60000
 BOOTMAGIC=0xc001d00d
 #ROM_SIZE=32768