diff options
| author | Ariane van der Steldt <ariane@cvs.openbsd.org> | 2011-05-17 18:06:14 +0000 |
|---|---|---|
| committer | Ariane van der Steldt <ariane@cvs.openbsd.org> | 2011-05-17 18:06:14 +0000 |
| commit | d0de42170315935a0a78d8218e8d58287064ffb8 (patch) | |
| tree | 0ff31bcf6f7975546b6676621534e05488c79d8d /sys | |
| parent | b498efdbbf13b1eec08541e3b2084396c508c92e (diff) | |
Use the same define checks as used in machdep.c for the trampoline code.
from Brad
ok mikeb@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/pmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/amd64/pmap.c b/sys/arch/amd64/amd64/pmap.c index f9e896ed005..53ca4cfe37d 100644 --- a/sys/arch/amd64/amd64/pmap.c +++ b/sys/arch/amd64/amd64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.62 2011/04/15 15:16:57 chl Exp $ */ +/* $OpenBSD: pmap.c,v 1.63 2011/05/17 18:06:13 ariane Exp $ */ /* $NetBSD: pmap.c,v 1.3 2003/05/08 18:13:13 thorpej Exp $ */ /* @@ -289,10 +289,8 @@ extern paddr_t msgbuf_paddr; extern vaddr_t idt_vaddr; /* we allocate IDT early */ extern paddr_t idt_paddr; -#ifdef _LP64 extern vaddr_t lo32_vaddr; extern vaddr_t lo32_paddr; -#endif vaddr_t virtual_avail; extern int end; @@ -649,7 +647,8 @@ pmap_bootstrap(paddr_t first_avail, paddr_t max_pa) idt_paddr = first_avail; /* steal a page */ first_avail += 2 * PAGE_SIZE; -#ifdef _LP64 +#if defined(MULTIPROCESSOR) || \ + (NACPI > 0 && !defined(SMALL_KERNEL)) /* * Grab a page below 4G for things that need it (i.e. * having an initial %cr3 for the MP trampoline). @@ -659,6 +658,7 @@ pmap_bootstrap(paddr_t first_avail, paddr_t max_pa) lo32_paddr = first_avail; first_avail += PAGE_SIZE; #endif + /* * init the global lists. */ |