|
 |
f96e0b |
From e98482f5ae472fb1f27a589dfb769c03121992ba Mon Sep 17 00:00:00 2001
|
|
|
f96e0b |
From: Colin Watson <cjwatson@ubuntu.com>
|
|
|
f96e0b |
Date: Sun, 20 Jan 2013 23:03:35 +0000
|
|
|
f96e0b |
Subject: [PATCH 123/482] * grub-core/loader/i386/linux.c (grub_cmd_initrd):
|
|
|
f96e0b |
Don't add the initrd size to addr_min, since the initrd will be allocated
|
|
|
f96e0b |
after this address.
|
|
|
f96e0b |
|
|
|
f96e0b |
---
|
|
|
f96e0b |
ChangeLog | 6 ++++++
|
|
|
f96e0b |
grub-core/loader/i386/linux.c | 3 +--
|
|
|
f96e0b |
2 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
f96e0b |
|
|
|
f96e0b |
diff --git a/ChangeLog b/ChangeLog
|
|
|
f96e0b |
index 4c21ea0..6886f29 100644
|
|
|
f96e0b |
--- a/ChangeLog
|
|
|
f96e0b |
+++ b/ChangeLog
|
|
|
f96e0b |
@@ -1,3 +1,9 @@
|
|
|
f96e0b |
+2013-01-20 Colin Watson <cjwatson@ubuntu.com>
|
|
|
f96e0b |
+
|
|
|
f96e0b |
+ * grub-core/loader/i386/linux.c (grub_cmd_initrd): Don't add the
|
|
|
f96e0b |
+ initrd size to addr_min, since the initrd will be allocated after
|
|
|
f96e0b |
+ this address.
|
|
|
f96e0b |
+
|
|
|
f96e0b |
2013-01-20 Andrey Borzenkov <arvidjaar@gmail.com>
|
|
|
f96e0b |
|
|
|
f96e0b |
* conf/Makefile.common: Fix autogen rules to pass definition
|
|
|
f96e0b |
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
|
|
|
f96e0b |
index 41357a5..92cabfb 100644
|
|
|
f96e0b |
--- a/grub-core/loader/i386/linux.c
|
|
|
f96e0b |
+++ b/grub-core/loader/i386/linux.c
|
|
|
f96e0b |
@@ -1115,8 +1115,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
|
f96e0b |
worse than that of Linux 2.3.xx, so avoid the last 64kb. */
|
|
|
f96e0b |
addr_max -= 0x10000;
|
|
|
f96e0b |
|
|
|
f96e0b |
- addr_min = (grub_addr_t) prot_mode_target + prot_init_space
|
|
|
f96e0b |
- + page_align (size);
|
|
|
f96e0b |
+ addr_min = (grub_addr_t) prot_mode_target + prot_init_space;
|
|
|
f96e0b |
|
|
|
f96e0b |
/* Put the initrd as high as possible, 4KiB aligned. */
|
|
|
f96e0b |
addr = (addr_max - size) & ~0xFFF;
|
|
|
f96e0b |
--
|
|
|
f96e0b |
1.8.2.1
|
|
|
f96e0b |
|