diff options
| author | Jan Beulich <jbeulich@suse.com> | 2013-07-08 13:16:29 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-07-08 13:16:29 +0200 |
| commit | 642e4f331599b42492abd9fc9450373aab02dfb6 (patch) | |
| tree | 69bf71b42181ecd167987e33d5586c1ca822c9cf /tools/firmware | |
| parent | 80e3eddcc4896ab40c24506fd05f9795c4039b48 (diff) | |
| download | xen-642e4f331599b42492abd9fc9450373aab02dfb6.tar.gz xen-642e4f331599b42492abd9fc9450373aab02dfb6.tar.bz2 xen-642e4f331599b42492abd9fc9450373aab02dfb6.zip | |
Revert "/home/jbeulich/tmp/commit.txt"
This reverts commit 80e3eddcc4896ab40c24506fd05f9795c4039b48.
Diffstat (limited to 'tools/firmware')
| -rw-r--r-- | 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 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(); |