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

	on i386.

diff --git a/ChangeLog b/ChangeLog
index 66d810e91de630c42f82728f98dc4f2bc02dab0e..d5e655b9006d6f3460f4001f7972425d2efd04f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/lib/i386/relocator_asm.S b/lib/i386/relocator_asm.S
index 6b803db13a69cc4f1a7918fcf2f47427d9c0deac..22490a3f88b4d7ebe91c36e9eef709d5761cffa8 100644 (file)
--- a/lib/i386/relocator_asm.S
+++ b/lib/i386/relocator_asm.S
@@ -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