|
@@ -3459,7 +3459,7 @@ io_apic_setup_irq_pin(unsigned int irq, int node, struct io_apic_irq_attr *attr)
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
-static int __init io_apic_get_redir_entries(int ioapic)
|
|
|
|
|
|
+static int io_apic_get_redir_entries(int ioapic)
|
|
{
|
|
{
|
|
union IO_APIC_reg_01 reg_01;
|
|
union IO_APIC_reg_01 reg_01;
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
@@ -3505,7 +3505,7 @@ int __init arch_probe_nr_irqs(void)
|
|
}
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_X86_32
|
|
#ifdef CONFIG_X86_32
|
|
-static int __init io_apic_get_unique_id(int ioapic, int apic_id)
|
|
|
|
|
|
+static int io_apic_get_unique_id(int ioapic, int apic_id)
|
|
{
|
|
{
|
|
union IO_APIC_reg_00 reg_00;
|
|
union IO_APIC_reg_00 reg_00;
|
|
static physid_mask_t apic_id_map = PHYSID_MASK_NONE;
|
|
static physid_mask_t apic_id_map = PHYSID_MASK_NONE;
|
|
@@ -3580,7 +3580,7 @@ static int __init io_apic_get_unique_id(int ioapic, int apic_id)
|
|
return apic_id;
|
|
return apic_id;
|
|
}
|
|
}
|
|
|
|
|
|
-static u8 __init io_apic_unique_id(int idx, u8 id)
|
|
|
|
|
|
+static u8 io_apic_unique_id(int idx, u8 id)
|
|
{
|
|
{
|
|
if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) &&
|
|
if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) &&
|
|
!APIC_XAPIC(apic_version[boot_cpu_physical_apicid]))
|
|
!APIC_XAPIC(apic_version[boot_cpu_physical_apicid]))
|
|
@@ -3589,7 +3589,7 @@ static u8 __init io_apic_unique_id(int idx, u8 id)
|
|
return id;
|
|
return id;
|
|
}
|
|
}
|
|
#else
|
|
#else
|
|
-static u8 __init io_apic_unique_id(int idx, u8 id)
|
|
|
|
|
|
+static u8 io_apic_unique_id(int idx, u8 id)
|
|
{
|
|
{
|
|
union IO_APIC_reg_00 reg_00;
|
|
union IO_APIC_reg_00 reg_00;
|
|
DECLARE_BITMAP(used, 256);
|
|
DECLARE_BITMAP(used, 256);
|
|
@@ -3636,7 +3636,7 @@ static u8 __init io_apic_unique_id(int idx, u8 id)
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-static int __init io_apic_get_version(int ioapic)
|
|
|
|
|
|
+static int io_apic_get_version(int ioapic)
|
|
{
|
|
{
|
|
union IO_APIC_reg_01 reg_01;
|
|
union IO_APIC_reg_01 reg_01;
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
@@ -3840,7 +3840,7 @@ int mp_find_ioapic_pin(int ioapic, u32 gsi)
|
|
return gsi - gsi_cfg->gsi_base;
|
|
return gsi - gsi_cfg->gsi_base;
|
|
}
|
|
}
|
|
|
|
|
|
-static __init int bad_ioapic(unsigned long address)
|
|
|
|
|
|
+static int bad_ioapic(unsigned long address)
|
|
{
|
|
{
|
|
if (nr_ioapics >= MAX_IO_APICS) {
|
|
if (nr_ioapics >= MAX_IO_APICS) {
|
|
pr_warn("WARNING: Max # of I/O APICs (%d) exceeded (found %d), skipping\n",
|
|
pr_warn("WARNING: Max # of I/O APICs (%d) exceeded (found %d), skipping\n",
|
|
@@ -3854,7 +3854,7 @@ static __init int bad_ioapic(unsigned long address)
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-static __init int bad_ioapic_register(int idx)
|
|
|
|
|
|
+static int bad_ioapic_register(int idx)
|
|
{
|
|
{
|
|
union IO_APIC_reg_00 reg_00;
|
|
union IO_APIC_reg_00 reg_00;
|
|
union IO_APIC_reg_01 reg_01;
|
|
union IO_APIC_reg_01 reg_01;
|
|
@@ -3873,8 +3873,8 @@ static __init int bad_ioapic_register(int idx)
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-void __init mp_register_ioapic(int id, u32 address, u32 gsi_base,
|
|
|
|
- struct ioapic_domain_cfg *cfg)
|
|
|
|
|
|
+void mp_register_ioapic(int id, u32 address, u32 gsi_base,
|
|
|
|
+ struct ioapic_domain_cfg *cfg)
|
|
{
|
|
{
|
|
int idx = 0;
|
|
int idx = 0;
|
|
int entries;
|
|
int entries;
|