|
 |
a5bd9f6 |
From 5657a74faa6aa56753f42e65b0806afb3cb7c842 Mon Sep 17 00:00:00 2001
|
|
|
a5bd9f6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
Date: Mon, 21 Jan 2013 22:44:20 +0100
|
|
|
a5bd9f6 |
Subject: [PATCH 138/364] * include/grub/kernel.h (FOR_MODULES): Adjust
|
|
|
a5bd9f6 |
to preserve alignment invariants.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
---
|
|
|
a5bd9f6 |
ChangeLog | 5 +++++
|
|
|
a5bd9f6 |
include/grub/kernel.h | 2 +-
|
|
|
a5bd9f6 |
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
a5bd9f6 |
index a2edbc5..c3405df 100644
|
|
|
a5bd9f6 |
--- a/ChangeLog
|
|
|
a5bd9f6 |
+++ b/ChangeLog
|
|
|
a5bd9f6 |
@@ -1,3 +1,8 @@
|
|
|
a5bd9f6 |
+2013-01-21 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
+ * include/grub/kernel.h (FOR_MODULES): Adjust to preserve alignment
|
|
|
a5bd9f6 |
+ invariants.
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
2013-01-21 Colin Watson <cjwatson@ubuntu.com>
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
* grub-core/font/font.c (blit_comb: do_blit): Make static instead of
|
|
|
a5bd9f6 |
diff --git a/include/grub/kernel.h b/include/grub/kernel.h
|
|
|
a5bd9f6 |
index 033479e..23e4f02 100644
|
|
|
a5bd9f6 |
--- a/include/grub/kernel.h
|
|
|
a5bd9f6 |
+++ b/include/grub/kernel.h
|
|
|
a5bd9f6 |
@@ -78,7 +78,7 @@ extern grub_addr_t EXPORT_VAR (grub_modbase);
|
|
|
a5bd9f6 |
var && (grub_addr_t) var \
|
|
|
a5bd9f6 |
< (grub_modbase + (((struct grub_module_info *) grub_modbase)->size)); \
|
|
|
a5bd9f6 |
var = (struct grub_module_header *) \
|
|
|
a5bd9f6 |
- ((void **) var + (((struct grub_module_header *) var)->size + sizeof (void *) - 1) / sizeof (void *)))
|
|
|
a5bd9f6 |
+ (((grub_uint32_t *) var) + ((((struct grub_module_header *) var)->size + sizeof (grub_addr_t) - 1) / sizeof (grub_addr_t)) * (sizeof (grub_addr_t) / sizeof (grub_uint32_t))))
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
grub_addr_t grub_modules_get_end (void);
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
--
|
|
|
a5bd9f6 |
1.8.1.4
|
|
|
a5bd9f6 |
|