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
713 B
Diff
26 lines
713 B
Diff
From dd66269a4bdece11f6ea1744da6b1a36b5acb663 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Mon, 11 Jul 2016 13:36:45 -0400
|
|
Subject: [PATCH 162/206] fix machine type test in 30_os-prober.in
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
util/grub.d/30_os-prober.in | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
|
|
index dc98eace934..e40274fc0f4 100644
|
|
--- a/util/grub.d/30_os-prober.in
|
|
+++ b/util/grub.d/30_os-prober.in
|
|
@@ -144,6 +144,7 @@ for OS in ${OSPROBED} ; do
|
|
sixteenbit=""
|
|
linuxefi="linux"
|
|
initrdefi="initrd"
|
|
+ machine=`uname -m`
|
|
case "$machine" in
|
|
i?86|x86_64)
|
|
sixteenbit="16"
|
|
--
|
|
2.15.0
|
|
|