D43914.1793900861.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D43914.1793900861.diff
View Options

	diff --git a/stand/i386/libi386/Makefile b/stand/i386/libi386/Makefile
	--- a/stand/i386/libi386/Makefile
	+++ b/stand/i386/libi386/Makefile
	@@ -44,7 +44,7 @@

	.ifdef(BOOT_BIOSDISK_DEBUG)
	# Make the disk code more talkative
	-CFLAGS+= -DDISK_DEBUG
	+CFLAGS.biosdisk.c+= -DDISK_DEBUG
	.endif

	# terminal emulation
	@@ -56,11 +56,7 @@
	CFLAGS.bootinfo.c+= -I${SRCTOP}/sys/teken -I${SRCTOP}/contrib/pnglite
	CFLAGS.vbe.c+= -I${SRCTOP}/sys/teken -I${SRCTOP}/contrib/pnglite

	-# XXX: make alloca() useable
	-CFLAGS+= -Dalloca=__builtin_alloca
	-
	-CFLAGS+= -I${BOOTSRC}/ficl -I${BOOTSRC}/ficl/i386 \
	- -I${LDRSRC} -I${BOOTSRC}/i386/common \
	+CFLAGS+= -I${LDRSRC} -I${BOOTSRC}/i386/common \
	-I${SYSDIR}/contrib/dev/acpica/include

	# Handle FreeBSD specific %b and %D printf format specifiers
	diff --git a/stand/i386/libi386/biospnp.c b/stand/i386/libi386/biospnp.c
	--- a/stand/i386/libi386/biospnp.c
	+++ b/stand/i386/libi386/biospnp.c
	@@ -155,6 +155,7 @@
	{
	uint8_t Node;
	struct pnp_devNode *devNodeBuffer;
	+ uint8_t buffer[max(pnp_NodeSize, sizeof(*devNodeBuffer))];
	int result;
	struct pnpinfo *pi;
	int count;
	@@ -163,7 +164,7 @@
	if (biospnp_init())
	return;

	- devNodeBuffer = (struct pnp_devNode *)alloca(pnp_NodeSize);
	+ devNodeBuffer = (struct pnp_devNode *)buffer;
	Node = 0;
	count = 1000;
	while((Node != 0xff) && (count-- > 0)) {