From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 17 May 2011 16:39:32 +0000 (+0200)
Subject: 	* grub-core/kern/mips/startup.S (grub_arch_cpuclock): Move to the right
X-Git-Tag: 2.00~1251
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90f7ac192fad8a204c1456dd90c239043ce70d91;p=thirdparty%2Fgrub.git

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

diff --git a/ChangeLog b/ChangeLog
index c0b2e0ce3..5cd5d0b8e 100644
--- 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 58acb00f3..1472aaf8c 100644
--- 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