From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon, 21 May 2012 20:40:34 +0000 (+0200)
Subject: 	* grub-core/kern/powerpc/dl.c (trampoline_template): Use r12 instead
X-Git-Tag: 2.00~194
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcaaae9dbe8a4b9f26ac4402ad924819acbc0fef;p=thirdparty%2Fgrub.git

	* grub-core/kern/powerpc/dl.c (trampoline_template): Use r12 instead
	of r0.
---

diff --git a/ChangeLog b/ChangeLog
index bfd84017d..ec520bebe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-21  Benjamin Herrenschmidt <benh@kernel.crashing.org>
+
+	* grub-core/kern/powerpc/dl.c (trampoline_template): Use r12 instead
+	of r0.
+
 2012-05-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Remove unjustified hard dependency of normal.mod on gfxterm.
diff --git a/grub-core/kern/powerpc/dl.c b/grub-core/kern/powerpc/dl.c
index b8a2b5009..0a8ec85ff 100644
--- a/grub-core/kern/powerpc/dl.c
+++ b/grub-core/kern/powerpc/dl.c
@@ -89,9 +89,9 @@ struct trampoline
 
 static const struct trampoline trampoline_template = 
   {
-    0x3c000000,
-    0x60000000,
-    0x7c0903a6,
+    0x3d800000,
+    0x618c0000,
+    0x7d8903a6,
     0x4e800420,
   };