grub2/0095-grub-core-kern-mips-arc-init.c-grub_machine_get_boot.patch
Peter Jones 8c6b1ac71e Reconcile with upstream once again.
Also include some minor fixes for gcc 5.1.1

Signed-off-by: Peter Jones <pjones@redhat.com>
2015-07-22 09:46:32 -04:00

41 lines
1.3 KiB
Diff

From 1de3a48098053aaebd35232bd73e3ce3f3fdf51c Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 25 Aug 2014 15:19:48 -0700
Subject: [PATCH 095/506] * grub-core/kern/mips/arc/init.c
(grub_machine_get_bootlocation): Initialise pend to pacify GCC.
---
ChangeLog | 5 +++++
grub-core/kern/mips/arc/init.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index a8f379b..6a99e2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-25 Colin Watson <cjwatson@ubuntu.com>
+
+ * grub-core/kern/mips/arc/init.c (grub_machine_get_bootlocation):
+ Initialise pend to pacify GCC.
+
2014-08-14 Andrey Borzenkov <arvidjaar@gmail.com>
* util/grub-mkconfig.in: Fix typo (gettext_print instead of
diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c
index b4f50e4..3834a14 100644
--- a/grub-core/kern/mips/arc/init.c
+++ b/grub-core/kern/mips/arc/init.c
@@ -360,7 +360,7 @@ grub_machine_get_bootlocation (char **device, char **path)
char *loaddev = boot_location;
char *pptr, *partptr;
char *dname;
- grub_disk_addr_t poff = -1, pend;
+ grub_disk_addr_t poff = -1, pend = -1;
struct get_device_name_ctx ctx;
grub_disk_t parent = 0;
unsigned i;
--
2.4.3