vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* lib/i386/relocator_asm.S [! __x86_64__]: Don't try to disable amd64

Browse source 
on i386.
This commit is contained in:
Thomas Frauendorfer 2010-07-20 15:59:56 +02:00 committed by Vladimir 'phcoder' Serbinenko
parent 39d824e8f9
commit a29d6a4bc5
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2010-07-20 Vladimir Serbinenko <phcoder@gmail.com>
* commands/acpi.c (setup_common_tables): Use sizeof instead of * commands/acpi.c (setup_common_tables): Use sizeof instead of

2
lib/i386/relocator_asm.S
View file

@ -157,11 +157,13 @@ LOCAL(cont1):
andl $(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax andl $(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax
movl %eax, %cr0 movl %eax, %cr0
#ifdef __x86_64__
/* Disable amd64. */ /* Disable amd64. */
movl $GRUB_MEMORY_CPU_AMD64_MSR, %ecx movl $GRUB_MEMORY_CPU_AMD64_MSR, %ecx
rdmsr rdmsr
andl $(~GRUB_MEMORY_CPU_AMD64_MSR_ON), %eax andl $(~GRUB_MEMORY_CPU_AMD64_MSR_ON), %eax
wrmsr wrmsr
#endif
/* Turn off PAE. */ /* Turn off PAE. */
movl %cr4, %eax movl %cr4, %eax