diff options
| author | kib <kib@FreeBSD.org> | 2015-04-27 08:02:12 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2015-04-27 08:02:12 +0000 |
| commit | facaa68fb95e65d46783aee588e7c99ae11d5e76 (patch) | |
| tree | 2490a68d0f0407f65b7522b1e69ee07cc835dfe8 /sys/x86 | |
| parent | bc0b39657e72b1c736b37854e76ac5d962c82641 (diff) | |
| download | FreeBSD-src-facaa68fb95e65d46783aee588e7c99ae11d5e76.zip FreeBSD-src-facaa68fb95e65d46783aee588e7c99ae11d5e76.tar.gz | |
MFC r281495:
Add config option PAE_TABLES for the i386 kernel. It switches pmap to
use PAE format for the page tables, but does not incur other
consequences of the full PAE config. In particular, vm_paddr_t and
bus_addr_t are left 32bit, and max supported memory is still limited
by 4GB.
The option allows to have nx permissions for memory mappings on i386
kernel, while keeping the usual i386 KBI and avoiding the kernel data
sizing problems typical for the PAE config.
Diffstat (limited to 'sys/x86')
| -rw-r--r-- | sys/x86/acpica/acpi_wakeup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/x86/acpica/acpi_wakeup.c b/sys/x86/acpica/acpi_wakeup.c index 74522be..a839f7c 100644 --- a/sys/x86/acpica/acpi_wakeup.c +++ b/sys/x86/acpica/acpi_wakeup.c @@ -368,7 +368,7 @@ acpi_install_wakeup_handler(struct acpi_softc *sc) /* Save pointers to some global data. */ WAKECODE_FIXUP(wakeup_ret, void *, resumectx); #ifndef __amd64__ -#ifdef PAE +#if defined(PAE) || defined(PAE_TABLES) WAKECODE_FIXUP(wakeup_cr3, register_t, vtophys(kernel_pmap->pm_pdpt)); #else WAKECODE_FIXUP(wakeup_cr3, register_t, vtophys(kernel_pmap->pm_pdir)); |
