aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/ia64/kernel/iosapic.c2
-rw-r--r--arch/ia64/kernel/setup.c2
-rw-r--r--include/asm-ia64/iosapic.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index dcfbf3e7a9ef..e87dd93d4db7 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -1013,7 +1013,7 @@ iosapic_register_platform_intr (u32 int_type, unsigned int gsi,
1013/* 1013/*
1014 * ACPI calls this when it finds an entry for a legacy ISA IRQ override. 1014 * ACPI calls this when it finds an entry for a legacy ISA IRQ override.
1015 */ 1015 */
1016void __init 1016void __devinit
1017iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi, 1017iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi,
1018 unsigned long polarity, 1018 unsigned long polarity,
1019 unsigned long trigger) 1019 unsigned long trigger)
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 6e19da122ae3..9df1efe7487d 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -786,7 +786,7 @@ identify_cpu (struct cpuinfo_ia64 *c)
786 c->unimpl_pa_mask = ~((1L<<63) | ((1L << phys_addr_size) - 1)); 786 c->unimpl_pa_mask = ~((1L<<63) | ((1L << phys_addr_size) - 1));
787} 787}
788 788
789void 789void __init
790setup_per_cpu_areas (void) 790setup_per_cpu_areas (void)
791{ 791{
792 /* start_kernel() requires this... */ 792 /* start_kernel() requires this... */
diff --git a/include/asm-ia64/iosapic.h b/include/asm-ia64/iosapic.h
index 20f98f1751a1..421cb6b62a7c 100644
--- a/include/asm-ia64/iosapic.h
+++ b/include/asm-ia64/iosapic.h
@@ -83,7 +83,7 @@ extern int gsi_to_irq (unsigned int gsi);
83extern int iosapic_register_intr (unsigned int gsi, unsigned long polarity, 83extern int iosapic_register_intr (unsigned int gsi, unsigned long polarity,
84 unsigned long trigger); 84 unsigned long trigger);
85extern void iosapic_unregister_intr (unsigned int irq); 85extern void iosapic_unregister_intr (unsigned int irq);
86extern void __init iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi, 86extern void __devinit iosapic_override_isa_irq (unsigned int isa_irq, unsigned int gsi,
87 unsigned long polarity, 87 unsigned long polarity,
88 unsigned long trigger); 88 unsigned long trigger);
89extern int __init iosapic_register_platform_intr (u32 int_type, 89extern int __init iosapic_register_platform_intr (u32 int_type,