1.1 --- a/xen/arch/x86/acpi/boot.c	Thu May 01 14:04:12 2008 +0100
     1.2 +++ b/xen/arch/x86/acpi/boot.c	Thu May 01 15:44:35 2008 +0100
     1.3 @@ -465,8 +465,9 @@ bad:
     1.4  static void __init
     1.5  acpi_fadt_parse_reg(struct acpi_table_fadt *fadt)
     1.6  {
     1.7 -	unsigned int len = min(fadt->header.length, sizeof(*fadt));
     1.8 +	unsigned int len;
     1.9  
    1.10 +	len = min_t(unsigned int, fadt->header.length, sizeof(*fadt));
    1.11  	memcpy(&acpi_gbl_FADT, fadt, len);
    1.12  
    1.13  	if (len > offsetof(struct acpi_table_fadt, xpm1b_event_block)) {