mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-25 06:37:33 +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>
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
From 5ccff1d133f501355b03fb756f859ccde07b5e5c Mon Sep 17 00:00:00 2001
|
|
From: "David E. Box" <david.e.box@linux.intel.com>
|
|
Date: Fri, 15 Sep 2017 15:37:05 -0700
|
|
Subject: [PATCH 197/206] tsc: Change default tsc calibration method to pmtimer
|
|
on EFI systems
|
|
|
|
On efi systems, make pmtimer based tsc calibration the default over the
|
|
pit. This prevents Grub from hanging on Intel SoC systems that power gate
|
|
the pit.
|
|
|
|
Signed-off-by: David E. Box <david.e.box@linux.intel.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
---
|
|
grub-core/kern/i386/tsc.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/kern/i386/tsc.c b/grub-core/kern/i386/tsc.c
|
|
index 2e85289d848..f266eb13185 100644
|
|
--- a/grub-core/kern/i386/tsc.c
|
|
+++ b/grub-core/kern/i386/tsc.c
|
|
@@ -68,7 +68,7 @@ grub_tsc_init (void)
|
|
#ifdef GRUB_MACHINE_XEN
|
|
(void) (grub_tsc_calibrate_from_xen () || calibrate_tsc_hardcode());
|
|
#elif defined (GRUB_MACHINE_EFI)
|
|
- (void) (grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode());
|
|
+ (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode());
|
|
#elif defined (GRUB_MACHINE_COREBOOT)
|
|
(void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || calibrate_tsc_hardcode());
|
|
#else
|
|
--
|
|
2.15.0
|
|
|