Revert "hvmloader: always include HPET table"

This reverts commit e4fd0475a0.

Conflicts:
	tools/firmware/hvmloader/acpi/build.c

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir.xen@gmail.com>
This commit is contained in:
Jan Beulich committed 2013-07-08 13:20:20 +02:00
1 parent 642e4f3315
commit 4867685f79
1 file changed
+7 -5
+7 -5
View File
@@ -268,11 +268,13 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
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();
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.