aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/ia64/kernel/acpi.c4
-rw-r--r--arch/ia64/kernel/iosapic.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index f3046bdd4b14..78bc21987121 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -74,7 +74,7 @@ unsigned int acpi_cpei_override;
74unsigned int acpi_cpei_phys_cpuid; 74unsigned int acpi_cpei_phys_cpuid;
75 75
76#define MAX_SAPICS 256 76#define MAX_SAPICS 256
77u16 ia64_acpiid_to_sapicid[MAX_SAPICS] = {[0...MAX_SAPICS - 1] = -1 }; 77u16 ia64_acpiid_to_sapicid[MAX_SAPICS] = {[0 ... MAX_SAPICS - 1] = -1 };
78 78
79EXPORT_SYMBOL(ia64_acpiid_to_sapicid); 79EXPORT_SYMBOL(ia64_acpiid_to_sapicid);
80 80
@@ -138,7 +138,7 @@ const char *acpi_get_sysname(void)
138 138
139/* Array to record platform interrupt vectors for generic interrupt routing. */ 139/* Array to record platform interrupt vectors for generic interrupt routing. */
140int platform_intr_list[ACPI_MAX_PLATFORM_INTERRUPTS] = { 140int platform_intr_list[ACPI_MAX_PLATFORM_INTERRUPTS] = {
141 [0...ACPI_MAX_PLATFORM_INTERRUPTS - 1] = -1 141 [0 ... ACPI_MAX_PLATFORM_INTERRUPTS - 1] = -1
142}; 142};
143 143
144enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_IOSAPIC; 144enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_IOSAPIC;
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 8f53915f4ae6..a13df592ebf7 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -735,11 +735,11 @@ again:
735 spin_unlock_irqrestore(&iosapic_lock, flags); 735 spin_unlock_irqrestore(&iosapic_lock, flags);
736 736
737 /* If vector is running out, we try to find a sharable vector */ 737 /* If vector is running out, we try to find a sharable vector */
738 vector = assign_irq_vector_nopanic(AUTO_ASSIGN); 738 vector = assign_irq_vector(AUTO_ASSIGN);
739 if (vector < 0) { 739 if (vector < 0) {
740 vector = iosapic_find_sharable_vector(trigger, polarity); 740 vector = iosapic_find_sharable_vector(trigger, polarity);
741 if (vector < 0) 741 if (vector < 0)
742 Return -ENOSPC; 742 return -ENOSPC;
743 } 743 }
744 744
745 spin_lock_irqsave(&irq_descp(vector)->lock, flags); 745 spin_lock_irqsave(&irq_descp(vector)->lock, flags);