diff options
| author | Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> | 2005-08-10 05:49:00 -0400 | 
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-08-10 18:42:41 -0400 | 
| commit | 1c53e4357ec72d6114c58d20c26d00a904f55da3 (patch) | |
| tree | 3448b43b8f781e42245f58fcddb11b8c933f0ff1 | |
| parent | bc68552faad0e134eb22281343d5ae5a4873fa80 (diff) | |
[IA64] fix iosapic_remove build error for !HOTPLUG
This patch removes the following stupid compile error that happens
when CONFIG_HOTPLUG is not defined on ia64.
     arch/ia64/kernel/built-in.o(.text+0x712): In function `acpi_unregister_ioapic':
     : undefined reference to `iosapic_remove'
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | include/asm-ia64/iosapic.h | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ia64/iosapic.h b/include/asm-ia64/iosapic.h index 1093f35b3b90..a429fe225b07 100644 --- a/include/asm-ia64/iosapic.h +++ b/include/asm-ia64/iosapic.h  | |||
| @@ -75,6 +75,8 @@ extern int __devinit iosapic_init (unsigned long address, | |||
| 75 | unsigned int gsi_base); | 75 | unsigned int gsi_base); | 
| 76 | #ifdef CONFIG_HOTPLUG | 76 | #ifdef CONFIG_HOTPLUG | 
| 77 | extern int iosapic_remove (unsigned int gsi_base); | 77 | extern int iosapic_remove (unsigned int gsi_base); | 
| 78 | #else | ||
| 79 | #define iosapic_remove(gsi_base) (-EINVAL) | ||
| 78 | #endif /* CONFIG_HOTPLUG */ | 80 | #endif /* CONFIG_HOTPLUG */ | 
| 79 | extern int gsi_to_vector (unsigned int gsi); | 81 | extern int gsi_to_vector (unsigned int gsi); | 
| 80 | extern int gsi_to_irq (unsigned int gsi); | 82 | extern int gsi_to_irq (unsigned int gsi); | 
| @@ -102,9 +104,7 @@ extern void __devinit map_iosapic_to_node (unsigned int, int); | |||
| 102 | #else | 104 | #else | 
| 103 | #define iosapic_system_init(pcat_compat) do { } while (0) | 105 | #define iosapic_system_init(pcat_compat) do { } while (0) | 
| 104 | #define iosapic_init(address,gsi_base) (-EINVAL) | 106 | #define iosapic_init(address,gsi_base) (-EINVAL) | 
| 105 | #ifdef CONFIG_HOTPLUG | ||
| 106 | #define iosapic_remove(gsi_base) (-ENODEV) | 107 | #define iosapic_remove(gsi_base) (-ENODEV) | 
| 107 | #endif /* CONFIG_HOTPLUG */ | ||
| 108 | #define iosapic_register_intr(gsi,polarity,trigger) (gsi) | 108 | #define iosapic_register_intr(gsi,polarity,trigger) (gsi) | 
| 109 | #define iosapic_unregister_intr(irq) do { } while (0) | 109 | #define iosapic_unregister_intr(irq) do { } while (0) | 
| 110 | #define iosapic_override_isa_irq(isa_irq,gsi,polarity,trigger) do { } while (0) | 110 | #define iosapic_override_isa_irq(isa_irq,gsi,polarity,trigger) do { } while (0) | 
