8c6b1ac71e
Also include some minor fixes for gcc 5.1.1 Signed-off-by: Peter Jones <pjones@redhat.com>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 46b74dd3cbb3a97a7abeb7f0464de548006e0e3d Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Wed, 26 Mar 2014 08:48:30 +0100
|
|
Subject: [PATCH 067/506] * grub-core/lib/relocator.c: Fix the case when
|
|
end of leftover is used.
|
|
|
|
---
|
|
ChangeLog | 4 ++++
|
|
grub-core/lib/relocator.c | 2 ++
|
|
2 files changed, 6 insertions(+)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 44ce649..b3f077a 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,3 +1,7 @@
|
|
+2014-03-26 Vladimir Serbinenko <phcoder@gmail.com>
|
|
+
|
|
+ * grub-core/lib/relocator.c: Fix the case when end of leftover is used.
|
|
+
|
|
2014-03-26 Fu Wei <fu.wei@linaro.org>
|
|
|
|
* grub-core/loader/arm64/linux.c: Remove redundant "0x".
|
|
diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
|
|
index 9f9770b..cb11ea5 100644
|
|
--- a/grub-core/lib/relocator.c
|
|
+++ b/grub-core/lib/relocator.c
|
|
@@ -865,6 +865,8 @@ malloc_in_range (struct grub_relocator *rel,
|
|
% GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT;
|
|
struct grub_relocator_fw_leftover *lo
|
|
= events[last_lo].leftover;
|
|
+ if (offend == 0 && alloc_end != alloc_start)
|
|
+ offend = GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT;
|
|
lo->freebytes[offstart / 8]
|
|
&= ((1 << (8 - (start % 8))) - 1);
|
|
grub_memset (lo->freebytes + (offstart + 7) / 8, 0,
|
|
--
|
|
2.4.3
|
|
|