Merge branch 'WIP.x86/asm' into x86/urgent, because the topic is ready

[linux-2.6-block.git] / arch / x86 / xen / apic.c

diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c
index 2163888497d326ec26d7eba1168541ce16f5a87a..5e53bfbe5823b78cb6666ce9c3fcf563eed3e47e 100644 (file)
--- a/arch/x86/xen/apic.c
+++ b/arch/x86/xen/apic.c
@@ -112,7 +112,7 @@ static int xen_madt_oem_check(char *oem_id, char *oem_table_id)
        return xen_pv_domain();
 }
 
-static int xen_id_always_valid(int apicid)
+static int xen_id_always_valid(u32 apicid)
 {
        return 1;
 }