mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
ce21efa858
- Pull in fixes for TSC calibration driver preference (prefer pmtimer over PIT) to boot on Apollo Lake systems with no PIT - Fix pmtimer calibration to not take forever to fail on kvm. Signed-off-by: Peter Jones <pjones@redhat.com>
30 lines
995 B
Diff
30 lines
995 B
Diff
From 15aee573d2312ebf4aab53d07d3d30eccf1484f9 Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Fri, 11 Mar 2016 10:26:51 +0100
|
|
Subject: [PATCH 005/123] xen_file: Fix invalid payload size
|
|
|
|
---
|
|
grub-core/loader/i386/xen_file.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/grub-core/loader/i386/xen_file.c b/grub-core/loader/i386/xen_file.c
|
|
index 583621890..37f9ad8ac 100644
|
|
--- a/grub-core/loader/i386/xen_file.c
|
|
+++ b/grub-core/loader/i386/xen_file.c
|
|
@@ -55,11 +55,11 @@ grub_xen_file (grub_file_t file)
|
|
grub_dprintf ("xen", "found bzimage payload 0x%llx-0x%llx\n",
|
|
(unsigned long long) (lh.setup_sects + 1) * 512
|
|
+ lh.payload_offset,
|
|
- (unsigned long long) lh.payload_length - 4);
|
|
+ (unsigned long long) lh.payload_length);
|
|
|
|
off_file = grub_file_offset_open (file, (lh.setup_sects + 1) * 512
|
|
+ lh.payload_offset,
|
|
- lh.payload_length - 4);
|
|
+ lh.payload_length);
|
|
if (!off_file)
|
|
goto fail;
|
|
|
|
--
|
|
2.14.3
|
|
|