UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[ACPI] fix ia64 build issues resulting from Lindent and merge 

Signed-off-by: MAEDA Naoaki <maeda.naoaki@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Brown, Len <len.brown@intel.com>
This commit is contained in:
MAEDA Naoaki 2005-08-08 01:09:00 -04:00 committed by Len Brown
parent 09d9200271
commit 702c7e7626
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ia64/kernel/acpi.c
View File

@ -74,7 +74,7 @@ unsigned int acpi_cpei_override;
unsigned int acpi_cpei_phys_cpuid; unsigned int acpi_cpei_phys_cpuid;
#define MAX_SAPICS 256 #define MAX_SAPICS 256
u16 ia64_acpiid_to_sapicid[MAX_SAPICS] = {[0...MAX_SAPICS - 1] = -1 }; u16 ia64_acpiid_to_sapicid[MAX_SAPICS] = {[0 ... MAX_SAPICS - 1] = -1 };
EXPORT_SYMBOL(ia64_acpiid_to_sapicid); EXPORT_SYMBOL(ia64_acpiid_to_sapicid);
@ -138,7 +138,7 @@ const char *acpi_get_sysname(void)
/* Array to record platform interrupt vectors for generic interrupt routing. */ /* Array to record platform interrupt vectors for generic interrupt routing. */
int platform_intr_list[ACPI_MAX_PLATFORM_INTERRUPTS] = { int platform_intr_list[ACPI_MAX_PLATFORM_INTERRUPTS] = {
[0...ACPI_MAX_PLATFORM_INTERRUPTS - 1] = -1 [0 ... ACPI_MAX_PLATFORM_INTERRUPTS - 1] = -1
}; };
enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_IOSAPIC; enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_IOSAPIC;

4
arch/ia64/kernel/iosapic.c
View File

@ -735,11 +735,11 @@ again:
spin_unlock_irqrestore(&iosapic_lock, flags); spin_unlock_irqrestore(&iosapic_lock, flags);
/* If vector is running out, we try to find a sharable vector */ /* If vector is running out, we try to find a sharable vector */
vector = assign_irq_vector_nopanic(AUTO_ASSIGN); vector = assign_irq_vector(AUTO_ASSIGN);
if (vector < 0) { if (vector < 0) {
vector = iosapic_find_sharable_vector(trigger, polarity); vector = iosapic_find_sharable_vector(trigger, polarity);
if (vector < 0) if (vector < 0)
Return -ENOSPC; return -ENOSPC;
} }
spin_lock_irqsave(&irq_descp(vector)->lock, flags); spin_lock_irqsave(&irq_descp(vector)->lock, flags);