summaryrefslogtreecommitdiffstats
path: root/sys/boot/efi/libefi
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-03-14 13:08:00 +0000
committerdim <dim@FreeBSD.org>2015-03-14 13:08:00 +0000
commit49820c9622102284e7ebb0dfd5599d53dce6571c (patch)
treed0e744ecfd1d272dd31501aae2c1ef4fa77a13f8 /sys/boot/efi/libefi
parentd6cbc26f7849e837bc29f43ea2b6d0a007ac4204 (diff)
parent470fe38d1f7205106865f5e7622c7a08d45eb0a2 (diff)
downloadFreeBSD-src-49820c9622102284e7ebb0dfd5599d53dce6571c.zip
FreeBSD-src-49820c9622102284e7ebb0dfd5599d53dce6571c.tar.gz
Merge ^/head r279893 through r279984.
Diffstat (limited to 'sys/boot/efi/libefi')
-rw-r--r--sys/boot/efi/libefi/Makefile2
-rw-r--r--sys/boot/efi/libefi/libefi.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile
index 55abffc..688ab60 100644
--- a/sys/boot/efi/libefi/Makefile
+++ b/sys/boot/efi/libefi/Makefile
@@ -9,7 +9,7 @@ SRCS= delay.c efi_console.c efinet.c efipart.c errno.c handles.c \
SRCS+= nullconsole.c comconsole.c
.if ${MACHINE_ARCH} == "amd64"
-CFLAGS+= -fPIC
+CFLAGS+= -fPIC -mno-red-zone
.endif
CFLAGS+= -I${.CURDIR}/../include
CFLAGS+= -I${.CURDIR}/../include/${MACHINE_CPUARCH}
diff --git a/sys/boot/efi/libefi/libefi.c b/sys/boot/efi/libefi/libefi.c
index c6c01d3..3c66b04 100644
--- a/sys/boot/efi/libefi/libefi.c
+++ b/sys/boot/efi/libefi/libefi.c
@@ -102,7 +102,7 @@ efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table)
(void)console_control->SetMode(console_control,
EfiConsoleControlScreenText);
- heapsize = 2 * 1024 * 1024;
+ heapsize = 3 * 1024 * 1024;
status = BS->AllocatePages(AllocateAnyPages, EfiLoaderData,
EFI_SIZE_TO_PAGES(heapsize), &heap);
if (status != EFI_SUCCESS)
OpenPOWER on IntegriCloud