summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2006-03-24 12:17:04 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2006-03-24 12:17:04 +0000
commit0d1a45585cd0bcdfb7d21d547495a27c5637ea20 (patch)
treec8d9a2f4498a5b968e06c4e9646627b9dfce0471 /sys/arch/i386
parent9b6ee2dddaf56861873a66a3d9e2bd3de19ac636 (diff)
move the mp tramp higher to avoid trashing boot args and also to fight strange memory zeroing happennning on some amd machines; toby@ ok
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/i386/machdep.c8
-rw-r--r--sys/arch/i386/include/mpbiosvar.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index c2ea26e000f..56d724079eb 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.350 2006/03/20 12:08:59 dlg Exp $ */
+/* $OpenBSD: machdep.c,v 1.351 2006/03/24 12:17:03 mickey Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -2940,9 +2940,9 @@ init386(paddr_t first_avail)
e = 0xfffff000;
}
- /* skip first four pages */
- if (a < 5 * NBPG)
- a = 5 * NBPG;
+ /* skip first eight pages */
+ if (a < 8 * NBPG)
+ a = 8 * NBPG;
/* skip shorter than page regions */
if (a >= e || (e - a) < NBPG) {
diff --git a/sys/arch/i386/include/mpbiosvar.h b/sys/arch/i386/include/mpbiosvar.h
index b281c3e381f..83f3b140bea 100644
--- a/sys/arch/i386/include/mpbiosvar.h
+++ b/sys/arch/i386/include/mpbiosvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpbiosvar.h,v 1.3 2005/11/23 09:24:52 mickey Exp $ */
+/* $OpenBSD: mpbiosvar.h,v 1.4 2006/03/24 12:17:03 mickey Exp $ */
/* $NetBSD: mpbiosvar.h,v 1.1.2.3 2000/02/29 13:17:20 sommerfeld Exp $ */
/*-
@@ -43,7 +43,7 @@
#ifndef _I386_MPBIOSVAR_H_
#define _I386_MPBIOSVAR_H_
-#define MP_TRAMPOLINE (2 * PAGE_SIZE)
+#define MP_TRAMPOLINE (7 * PAGE_SIZE)
#if !defined(_LOCORE)