38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
|
References: bnc#817799
|
||
|
|
|
||
|
|
# Commit 4867685f7916bb594a67f2f64a28bbf5ecb4949c
|
||
|
|
# Date 2013-07-08 13:20:20 +0200
|
||
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
||
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
||
|
|
Revert "hvmloader: always include HPET table"
|
||
|
|
|
||
|
|
This reverts commit e4fd0475a08fda414da27c4e57b568f147cfc07e.
|
||
|
|
|
||
|
|
Conflicts:
|
||
|
|
tools/firmware/hvmloader/acpi/build.c
|
||
|
|
|
||
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
||
|
|
Acked-by: Keir Fraser <keir.xen@gmail.com>
|
||
|
|
|
||
|
|
--- a/tools/firmware/hvmloader/acpi/build.c
|
||
|
|
+++ b/tools/firmware/hvmloader/acpi/build.c
|
||
|
|
@@ -268,11 +268,13 @@ static int construct_secondary_tables(un
|
||
|
|
table_ptrs[nr_tables++] = (unsigned long)madt;
|
||
|
|
}
|
||
|
|
|
||
|
|
- /* 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;
|
||
|
|
+ /* HPET. */
|
||
|
|
+ if ( hpet_exists(ACPI_HPET_ADDRESS) )
|
||
|
|
+ {
|
||
|
|
+ hpet = construct_hpet();
|
||
|
|
+ if (!hpet) return -1;
|
||
|
|
+ table_ptrs[nr_tables++] = (unsigned long)hpet;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
/* WAET. */
|
||
|
|
waet = construct_waet();
|