From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 1 May 2008 14:44:35 +0000 (+0100)
Subject: i386: Fix the build.
X-Git-Tag: 3.3.0-rc1~238^2~40
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d9ffcbc5e4e0ee8062818703e145162db82621b3;p=xen.git

i386: Fix the build.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c
index a9c013e8eb..6ff77d3566 100644
--- a/xen/arch/x86/acpi/boot.c
+++ b/xen/arch/x86/acpi/boot.c
@@ -465,8 +465,9 @@ bad:
 static void __init
 acpi_fadt_parse_reg(struct acpi_table_fadt *fadt)
 {
-	unsigned int len = min(fadt->header.length, sizeof(*fadt));
+	unsigned int len;
 
+	len = min_t(unsigned int, fadt->header.length, sizeof(*fadt));
 	memcpy(&acpi_gbl_FADT, fadt, len);
 
 	if (len > offsetof(struct acpi_table_fadt, xpm1b_event_block)) {