* grub-core/kern/mips/startup.S (grub_arch_cpuclock): Move to the right

	place.

diff --git a/ChangeLog b/ChangeLog
index c0b2e0ce3081e14d53bd6259555afa663bcba85d..5cd5d0b8e93947c4a64eed9630fb3d284fd27110 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/mips/startup.S (grub_arch_cpuclock): Move to the right
+       place.
+
 2011-05-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Reenable qemu-mips port.

diff --git a/grub-core/kern/mips/startup.S b/grub-core/kern/mips/startup.S
index 58acb00f395c076f3fbb3c173f530bbb277b45e0..1472aaf8c53b6d9a6d3962367d83de65f38fea93 100644 (file)
--- a/grub-core/kern/mips/startup.S
+++ b/grub-core/kern/mips/startup.S
@@ -51,18 +51,16 @@ VARIABLE(grub_prefix)
         */
 
        . = _start + GRUB_KERNEL_MACHINE_PREFIX_END
-VARIABLE (grub_arch_cpuclock)
-       .long 0
-#ifdef GRUB_MACHINE_MIPS_LOONGSON
 VARIABLE (grub_arch_busclock)
        .long 0
+VARIABLE (grub_arch_cpuclock)
+       .long 0
 VARIABLE (grub_arch_memsize)
        .long 0
 VARIABLE (grub_arch_highmemsize)
        .long 0
 VARIABLE (grub_arch_machine)
        .long GRUB_ARCH_MACHINE_FULOONG
-#endif
 cont:
        /* Save our base.  */
        move $s0, $ra