summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authorMike Larkin <mlarkin@cvs.openbsd.org>2016-02-20 19:59:02 +0000
committerMike Larkin <mlarkin@cvs.openbsd.org>2016-02-20 19:59:02 +0000
commitd807cb9d491174f58f28889a2478adaef65b450c (patch)
tree9cacb46a0d5f96468c5ba46de3db84e4f87fbfbe /sys/arch/i386/conf
parent042db22ef78a3044a4d43fdd89b3495d465126e3 (diff)
Fixes a boot issue on non-ACPI i386 machines that need X permissions on
the BIOS region in the ISA hole. Also fix a separate unrelated issue relating to placing R/O (no X) permissions on the kernel symbol area on bsd.rd. ok deraadt
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/ld.script4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/ld.script b/sys/arch/i386/conf/ld.script
index aa0665b828a..58867dd459e 100644
--- a/sys/arch/i386/conf/ld.script
+++ b/sys/arch/i386/conf/ld.script
@@ -1,4 +1,4 @@
-/* $OpenBSD: ld.script,v 1.2 2015/08/15 19:01:39 mlarkin Exp $ */
+/* $OpenBSD: ld.script,v 1.3 2016/02/20 19:59:01 mlarkin Exp $ */
/*
* Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -113,7 +113,7 @@ SECTIONS
. = ALIGN(0x1000);
} :bss
__kernel_bss_end = .;
- . = ALIGN(0x200000);
+ . = ALIGN(0x1000);
_end = .;
PROVIDE (end = .);
__kernel_end_phys = . & 0xfffffff;