Marcus Meissner
3ded5cdd6f
- Backport upstream patches for HyperV gen2 TSC timer calbration without RTC (bsc#904647) * added 0001-grub-core-kern-i386-tsc.c-calibrate_tsc-Ensure-that.patch * added 0002-i386-tsc-Fix-unused-function-warning-on-xen.patch * added 0003-acpi-do-not-skip-BIOS-scan-if-EBDA-length-is-zero.patch * added 0004-tsc-Use-alternative-delay-sources-whenever-appropria.patch * added 0005-i386-fix-TSC-calibration-using-PIT.patch OBS-URL: https://build.opensuse.org/request/show/355366 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=200
32 lines
864 B
Diff
32 lines
864 B
Diff
From 50ebc8f5f35a322b3736c03e16de7108932126b0 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Sun, 22 Feb 2015 13:12:44 +0100
|
|
Subject: [PATCH] i386/tsc: Fix unused function warning on xen.
|
|
|
|
---
|
|
grub-core/kern/i386/tsc.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
Index: grub-2.02~beta2/grub-core/kern/i386/tsc.c
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/grub-core/kern/i386/tsc.c
|
|
+++ grub-2.02~beta2/grub-core/kern/i386/tsc.c
|
|
@@ -57,6 +57,8 @@ grub_get_tsc (void)
|
|
return (((grub_uint64_t) hi) << 32) | lo;
|
|
}
|
|
|
|
+#ifndef GRUB_MACHINE_XEN
|
|
+
|
|
static __inline int
|
|
grub_cpu_is_tsc_supported (void)
|
|
{
|
|
@@ -69,8 +71,6 @@ grub_cpu_is_tsc_supported (void)
|
|
return (d & (1 << 4)) != 0;
|
|
}
|
|
|
|
-#ifndef GRUB_MACHINE_XEN
|
|
-
|
|
static void
|
|
grub_pit_wait (grub_uint16_t tics)
|
|
{
|