---

yaml --- r: 145652 b: refs/heads/master c: 58f892e h: refs/heads/master v: v3
git-mirror · Jun 2, 2009 · 14f66b2 · 14f66b2
1 parent 2a64a72
commit 14f66b2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee4c24a5c9b530481394132c8dbc10572d57c075
+refs/heads/master: 58f892e022e88438183c48661dcdc6a2997dab99
diff --git a/trunk/arch/x86/kernel/acpi/boot.c b/trunk/arch/x86/kernel/acpi/boot.c
@@ -985,11 +985,8 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
 
 	set_fixmap_nocache(FIX_IO_APIC_BASE_0 + idx, address);
 	mp_ioapics[idx].apicid = uniq_ioapic_id(id);
-#ifdef CONFIG_X86_32
 	mp_ioapics[idx].apicver = io_apic_get_version(idx);
-#else
-	mp_ioapics[idx].apicver = 0;
-#endif
+
 	/*
 	 * Build basic GSI lookup table to facilitate gsi->io_apic lookups
 	 * and to prevent reprogramming of IOAPIC pins (PCI GSIs).

diff --git a/trunk/arch/x86/kernel/apic/io_apic.c b/trunk/arch/x86/kernel/apic/io_apic.c
@@ -4012,6 +4012,7 @@ int __init io_apic_get_unique_id(int ioapic, int apic_id)
 
 	return apic_id;
 }
+#endif
 
 int __init io_apic_get_version(int ioapic)
 {
@@ -4024,7 +4025,6 @@ int __init io_apic_get_version(int ioapic)
 
 	return reg_01.bits.version;
 }
-#endif
 
 int acpi_get_override_irq(int bus_irq, int *trigger, int *polarity)
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4012,6 +4012,7 @@ int __init io_apic_get_unique_id(int ioapic, int apic_id) @@
     	return apic_id;
     }
+    #endif
     int __init io_apic_get_version(int ioapic)
     {
@@ Expand All / @@ -4024,7 +4025,6 @@ int __init io_apic_get_version(int ioapic) @@
     	return reg_01.bits.version;
     }
-    #endif
     int acpi_get_override_irq(int bus_irq, int *trigger, int *polarity)
     {
@@ Expand Down @@