Use mtmsr rather than mtmsrd in ppc64el-disable-vsx.patch, since the "VSX Available" bit is in the lower half of the MSR anyway, and mtmsrd faults on 32-bit systems (closes: #776400).

debian/.git-dpm

@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-df4a549e72451e65578d055400fb5f213a4699fb
+9d4f1601e187894da565f4573b5d174dcf586cd6
-df4a549e72451e65578d055400fb5f213a4699fb
+9d4f1601e187894da565f4573b5d174dcf586cd6
 e8f07821cce1bd0ab6d5622c2a42440f15f4fd71
 e8f07821cce1bd0ab6d5622c2a42440f15f4fd71
 grub2_2.02~beta2.orig.tar.xz

debian/changelog

@@ -8,6 +8,11 @@ grub2 (2.02~beta2-21) UNRELEASED; urgency=medium
   * Add support for running a 64-bit Linux kernel on a 32-bit EFI (closes:
     #775202).
 
+  [ Colin Watson ]
+  * Use mtmsr rather than mtmsrd in ppc64el-disable-vsx.patch, since the
+    "VSX Available" bit is in the lower half of the MSR anyway, and mtmsrd
+    faults on 32-bit systems (closes: #776400).
+
  -- Mathieu Trudel-Lapierre <mathieu.tl@gmail.com>  Fri, 23 Jan 2015 13:43:16 -0500
 
 grub2 (2.02~beta2-20) unstable; urgency=medium

debian/patches/check_blocklists_overlap_fix.patch

@@ -1,4 +1,4 @@
-From 2549deb51c3636669b42370c1b2a5c7091016420 Mon Sep 17 00:00:00 2001
+From 2a54e1b19aa1e080f9795a00d7381c0be85b2a4b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=9F=D0=B5=D1=85=D0=BE?=
  =?UTF-8?q?=D0=B2?= <roman_pekhov>
 Date: Sun, 22 Jun 2014 03:51:50 +0400

debian/patches/gettext-print-typo.patch

@@ -1,4 +1,4 @@
-From 20886bef9351d5c20a9de1fb3339fe40114f01d1 Mon Sep 17 00:00:00 2001
+From 34411ff593136ce78ab5c21706dfb7ae3655a16f Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Thu, 14 Aug 2014 21:02:31 +0400
 Subject: Fix typo (gettext_print instead of gettext_printf)

debian/patches/grub-install-extra-removable.patch

@@ -1,4 +1,4 @@
-From 617a691e4a95e67967ca8b0c77c59d347df182d6 Mon Sep 17 00:00:00 2001
+From 0c98fa2f582d686e2e9ebdc7065b4475d38e57cb Mon Sep 17 00:00:00 2001
 From: Steve McIntyre <93sam@debian.org>
 Date: Wed, 3 Dec 2014 01:25:12 +0000
 Subject: Add support for forcing EFI installation to the removable media path

debian/patches/grub-install-pvxen-paths.patch

@@ -1,4 +1,4 @@
-From 313d9a785287753409051363335a26e75855cbd6 Mon Sep 17 00:00:00 2001
+From 1f6d5327f7ae4d6b2cccb6a7c7bd19e86dffbc6e Mon Sep 17 00:00:00 2001
 From: Ian Campbell <ijc@hellion.org.uk>
 Date: Sat, 6 Sep 2014 12:20:12 +0100
 Subject: grub-install: Install PV Xen binaries into the upstream specified

debian/patches/insmod-xzio-and-lzopio-on-xen.patch

@@ -1,4 +1,4 @@
-From b837a9997cb306dc9aaeb3308f05d08cef402456 Mon Sep 17 00:00:00 2001
+From 117750671b90c8576dab576af524f29df9a0981c Mon Sep 17 00:00:00 2001
 From: Ian Campbell <ijc@debian.org>
 Date: Sun, 30 Nov 2014 12:12:52 +0000
 Subject: Arrange to insmod xzio and lzopio when booting a kernel as a Xen

debian/patches/mixed_size_efi.patch

@@ -1,4 +1,4 @@
-From df4a549e72451e65578d055400fb5f213a4699fb Mon Sep 17 00:00:00 2001
+From 9d4f1601e187894da565f4573b5d174dcf586cd6 Mon Sep 17 00:00:00 2001
 From: Steve McIntyre <93sam@debian.org>
 Date: Tue, 27 Jan 2015 20:08:53 +0000
 Subject: Add support for running a 64-bit Linux kernel on a 32-bit EFI

debian/patches/mkconfig_other_inits.patch

@@ -1,4 +1,4 @@
-From cbc80b2e595a7c4938dabd8264c2ff6a26eb4863 Mon Sep 17 00:00:00 2001
+From 810bd3508823c23b4fe05a4edcaf822932a9fffb Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sat, 3 Jan 2015 12:04:59 +0000
 Subject: Generate alternative init entries in advanced menu

debian/patches/ppc64el-disable-vsx.patch

@@ -1,4 +1,4 @@
-From 8a1286ce461f0866b26e56ed83626b1d7818f51a Mon Sep 17 00:00:00 2001
+From f7e1bb53e4ea20869766206e348ad97351f94bb2 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
 Date: Thu, 25 Sep 2014 19:33:39 -0300
 Subject: Disable VSX instruction
@@ -10,17 +10,18 @@ Kernel will activate it when necessary.
 * grub-core/kern/powerpc/ieee1275/startup.S: Disable VSX.
 
 Also-By: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
+Also-By: Colin Watson <cjwatson@debian.org>
 
 Origin: other, https://lists.gnu.org/archive/html/grub-devel/2014-09/msg00078.html
-Last-Update: 2014-09-26
+Last-Update: 2015-01-27
 
 Patch-Name: ppc64el-disable-vsx.patch
 ---
- grub-core/kern/powerpc/ieee1275/startup.S | 10 ++++++++++
+ grub-core/kern/powerpc/ieee1275/startup.S | 12 ++++++++++++
- 1 file changed, 10 insertions(+)
+ 1 file changed, 12 insertions(+)
 
 diff --git a/grub-core/kern/powerpc/ieee1275/startup.S b/grub-core/kern/powerpc/ieee1275/startup.S
-index 21c884b..b4d9c21 100644
+index 21c884b..de9a960 100644
 --- a/grub-core/kern/powerpc/ieee1275/startup.S
 +++ b/grub-core/kern/powerpc/ieee1275/startup.S
 @@ -20,6 +20,8 @@
@@ -32,7 +33,7 @@ index 21c884b..b4d9c21 100644
  .extern __bss_start
  .extern _end
  
-@@ -28,6 +30,14 @@
+@@ -28,6 +30,16 @@
  	.globl	start, _start
  start:
  _start:
@@ -41,7 +42,9 @@ index 21c884b..b4d9c21 100644
 +    /* Disable VSX instruction */
 +	mfmsr  0
 +	oris   0,0,MSR_VSX
-+	mtmsrd 0
++	/* The "VSX Available" bit is in the lower half of the MSR, so we
++	   don't need mtmsrd, which in any case won't work in 32-bit mode.  */
++	mtmsr  0
 +	isync
 +
  	li      2, 0

grub-core/kern/powerpc/ieee1275/startup.S

@@ -35,7 +35,9 @@ _start:
     /* Disable VSX instruction */
 	mfmsr  0
 	oris   0,0,MSR_VSX
-	mtmsrd 0
+	/* The "VSX Available" bit is in the lower half of the MSR, so we
+	   don't need mtmsrd, which in any case won't work in 32-bit mode.  */
+	mtmsr  0
 	isync
 
 	li      2, 0