From: Jan Beulich <jbeulich@suse.com>
Date: Mon, 8 Jul 2013 11:16:29 +0000 (+0200)
Subject: Revert "/home/jbeulich/tmp/commit.txt"
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6655
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=642e4f331599b42492abd9fc9450373aab02dfb6;p=xen.git

Revert "/home/jbeulich/tmp/commit.txt"

This reverts commit 80e3eddcc4896ab40c24506fd05f9795c4039b48.
---

diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c
index f1dd3f0e69..7281b972fc 100644
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -268,13 +268,11 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
         table_ptrs[nr_tables++] = (unsigned long)madt;
     }
 
-    /* HPET. */
-    if ( hpet_exists(ACPI_HPET_ADDRESS) )
-    {
-        hpet = construct_hpet();
-        if (!hpet) return -1;
-        table_ptrs[nr_tables++] = (unsigned long)hpet;
-    }
+    /* HPET. Always included in DSDT, so always include it here too. */
+    /* (And it's unconditionally required by Windows SVVP tests.) */
+    hpet = construct_hpet();
+    if (!hpet) return -1;
+    table_ptrs[nr_tables++] = (unsigned long)hpet;
 
     /* WAET. */
     waet = construct_waet();