[Xen-changelog] [xen master] Revert "/home/jbeulich/tmp/commit.txt"

[patchbot@xxxxxxx]

commit 642e4f331599b42492abd9fc9450373aab02dfb6
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Jul 8 13:16:29 2013 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Jul 8 13:16:29 2013 +0200

    Revert "/home/jbeulich/tmp/commit.txt"
    
    This reverts commit 80e3eddcc4896ab40c24506fd05f9795c4039b48.
---
 tools/firmware/hvmloader/acpi/build.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/tools/firmware/hvmloader/acpi/build.c 
b/tools/firmware/hvmloader/acpi/build.c
index f1dd3f0..7281b97 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();
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog