diff options
author | Jolan Luff <jolan@cvs.openbsd.org> | 2010-03-08 03:40:51 +0000 |
---|---|---|
committer | Jolan Luff <jolan@cvs.openbsd.org> | 2010-03-08 03:40:51 +0000 |
commit | 0063071adf2b1ad4594c874fffade97271345dd3 (patch) | |
tree | 1134f6de111816fbb9fe1d10eaaf78c5dc1beff6 /sys | |
parent | 15993dbbc70e8261dc44e52a5c52ffabf0b3c07d (diff) |
fix compiling without ACPI, ok marco@ deraadt@ krw@ mlarkin@
Diffstat (limited to 'sys')
-rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index f9edb8df3e3..71d31ce611b 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.104 2010/03/07 04:14:22 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.105 2010/03/08 03:40:50 jolan Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -1264,10 +1264,10 @@ init_x86_64(paddr_t first_avail) avail_start = MP_TRAMPOLINE + PAGE_SIZE; #endif -#ifndef SMALL_KERNEL +#if (NACPI > 0 && !defined(SMALL_KERNEL)) if (avail_start < ACPI_TRAMPOLINE + PAGE_SIZE) avail_start = ACPI_TRAMPOLINE + PAGE_SIZE; -#endif /* !SMALL_KERNEL */ +#endif /* Let us know if we're supporting > 4GB ram load */ if (bigmem) |