mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-25 00:29:23 +00:00
* lib/i386/relocator_asm.S [! __x86_64__]: Don't try to disable amd64
on i386.
This commit is contained in:
1 parent
39d824e8f9
commit
a29d6a4bc5
2 files changed
+7
No files matched your search
@@ -1,3 +1,8 @@
|
||||
2010-07-20 Thomas Frauendorfer <Thomas.Frauendorfer@googlemail.com>
|
||||
|
||||
* lib/i386/relocator_asm.S [! __x86_64__]: Don't try to disable amd64
|
||||
on i386.
|
||||
|
||||
2010-07-20 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* commands/acpi.c (setup_common_tables): Use sizeof instead of
|
||||
|
||||
@@ -157,11 +157,13 @@ LOCAL(cont1):
|
||||
andl $(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax
|
||||
movl %eax, %cr0
|
||||
|
||||
#ifdef __x86_64__
|
||||
/* Disable amd64. */
|
||||
movl $GRUB_MEMORY_CPU_AMD64_MSR, %ecx
|
||||
rdmsr
|
||||
andl $(~GRUB_MEMORY_CPU_AMD64_MSR_ON), %eax
|
||||
wrmsr
|
||||
#endif
|
||||
|
||||
/* Turn off PAE. */
|
||||
movl %cr4, %eax
|
||||
|
||||
Reference in new issue
Block a user