mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 15:46:53 +00:00
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>
26 lines
801 B
Diff
26 lines
801 B
Diff
From 68d54b55f49249c5e0517bf189f0f3df7ee6a36f Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Mon, 10 Jul 2017 01:34:22 +0000
|
|
Subject: [PATCH 049/206] fdt: silence clang warning.
|
|
|
|
---
|
|
grub-core/lib/fdt.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c
|
|
index bdc6302448d..2705f2629b9 100644
|
|
--- a/grub-core/lib/fdt.c
|
|
+++ b/grub-core/lib/fdt.c
|
|
@@ -309,7 +309,8 @@ advance_token (const void *fdt, const grub_uint32_t *token, const grub_uint32_t
|
|
continue;
|
|
}
|
|
char *ptr;
|
|
- for (ptr = (char *) (token + 1); *ptr && ptr < (char *) end; ptr++);
|
|
+ for (ptr = (char *) (token + 1); *ptr && ptr < (char *) end; ptr++)
|
|
+ ;
|
|
if (ptr >= (char *) end)
|
|
return 0;
|
|
return token;
|
|
--
|
|
2.15.0
|
|
|