81987f4958
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
46 lines
1.2 KiB
Diff
46 lines
1.2 KiB
Diff
From 95aeba5fe67ad11a995eb8e583708a722b8bdeb9 Mon Sep 17 00:00:00 2001
|
|
From: William Jon McCann <william.jon.mccann@gmail.com>
|
|
Date: Wed, 15 May 2013 13:53:48 -0400
|
|
Subject: [PATCH 091/206] Don't print GNU GRUB header
|
|
|
|
No one cares.
|
|
---
|
|
grub-core/normal/main.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
|
index b2654ef62e8..f57b7508a76 100644
|
|
--- a/grub-core/normal/main.c
|
|
+++ b/grub-core/normal/main.c
|
|
@@ -202,15 +202,16 @@ read_config_file (const char *config)
|
|
/* Initialize the screen. */
|
|
void
|
|
grub_normal_init_page (struct grub_term_output *term,
|
|
- int y)
|
|
+ int y __attribute__((__unused__)))
|
|
{
|
|
+ grub_term_cls (term);
|
|
+
|
|
+#if 0
|
|
grub_ssize_t msg_len;
|
|
int posx;
|
|
char *msg_formatted;
|
|
grub_uint32_t *unicode_msg;
|
|
grub_uint32_t *last_position;
|
|
-
|
|
- grub_term_cls (term);
|
|
|
|
msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION);
|
|
if (!msg_formatted)
|
|
@@ -235,6 +236,7 @@ grub_normal_init_page (struct grub_term_output *term,
|
|
grub_putcode ('\n', term);
|
|
grub_putcode ('\n', term);
|
|
grub_free (unicode_msg);
|
|
+#endif
|
|
}
|
|
|
|
static void
|
|
--
|
|
2.15.0
|
|
|