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

	of r0.

diff --git a/ChangeLog b/ChangeLog
index bfd84017d75dee818fa38b06e0b125bec83b1741..ec520bebe478a36e5da330d06142f436d8bab760 100644 (file)
--- 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 b8a2b500969d91b6ebdc26d5f421ef946a13c5f5..0a8ec85ff4421a731286cc838cb4b04015c99824 100644 (file)
--- 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,
   };