diff options
author | MAEDA Naoaki <maeda.naoaki@jp.fujitsu.com> | 2005-08-08 01:09:00 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-15 22:26:06 -0400 |
commit | 702c7e7626deeabb057b6f529167b65ec2eefbdb (patch) | |
tree | 2f3be3565a207ad89a6ff27aa59b91d2fdf49417 /arch/ia64/kernel/iosapic.c | |
parent | 09d92002718edf8ef284ec3726247acc83efbbe0 (diff) |
[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>
Diffstat (limited to 'arch/ia64/kernel/iosapic.c')
-rw-r--r-- | arch/ia64/kernel/iosapic.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |