aboutsummaryrefslogtreecommitdiff
path: root/sys/amd64/acpica/acpi_wakecode.S
diff options
context:
space:
mode:
authorRoger Pau Monné <royger@FreeBSD.org>2014-07-23 15:53:29 +0000
committerRoger Pau Monné <royger@FreeBSD.org>2014-07-23 15:53:29 +0000
commitf5417a03e3e4c87d2804fda2779a74b91c479bd9 (patch)
tree9233ce05d2733cb98fe8c182cc4d692fea521c4a /sys/amd64/acpica/acpi_wakecode.S
parentabcd8f453549d637863b3a01cda56d013acede91 (diff)
downloadsrc-f5417a03e3e4c87d2804fda2779a74b91c479bd9.tar.gz
src-f5417a03e3e4c87d2804fda2779a74b91c479bd9.zip
don't set CR4 PSE bit on amd64
Setting PSE together with PAE or in long mode just makes the PSE bit completely ignored, so don't set it. Sponsored by: Citrix Systems R&D Reviewed by: kib
Notes
Notes: svn path=/head/; revision=269017
Diffstat (limited to 'sys/amd64/acpica/acpi_wakecode.S')
-rw-r--r--sys/amd64/acpica/acpi_wakecode.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/amd64/acpica/acpi_wakecode.S b/sys/amd64/acpica/acpi_wakecode.S
index c4b0dcdfd502..a4c559fc8917 100644
--- a/sys/amd64/acpica/acpi_wakecode.S
+++ b/sys/amd64/acpica/acpi_wakecode.S
@@ -148,9 +148,9 @@ wakeup_32:
mov $bootdata32 - bootgdt, %eax
mov %ax, %ds
- /* Turn on the PAE and PSE bits for when paging is enabled */
+ /* Turn on the PAE bit for when paging is enabled */
mov %cr4, %eax
- orl $(CR4_PAE | CR4_PSE), %eax
+ orl $CR4_PAE, %eax
mov %eax, %cr4
/*