summaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/iosapic.c
diff options
context:
space:
mode:
authorMAEDA Naoaki <maeda.naoaki@jp.fujitsu.com>2005-08-08 01:09:00 -0400
committerLen Brown <len.brown@intel.com>2005-08-15 22:26:06 -0400
commit702c7e7626deeabb057b6f529167b65ec2eefbdb (patch)
tree2f3be3565a207ad89a6ff27aa59b91d2fdf49417 /arch/ia64/kernel/iosapic.c
parent09d92002718edf8ef284ec3726247acc83efbbe0 (diff)
downloadop-kernel-dev-702c7e7626deeabb057b6f529167b65ec2eefbdb.zip
op-kernel-dev-702c7e7626deeabb057b6f529167b65ec2eefbdb.tar.gz
[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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 8f53915..a13df59 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -735,11 +735,11 @@ again:
spin_unlock_irqrestore(&iosapic_lock, flags);
/* 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) {
vector = iosapic_find_sharable_vector(trigger, polarity);
if (vector < 0)
- Return -ENOSPC;
+ return -ENOSPC;
}
spin_lock_irqsave(&irq_descp(vector)->lock, flags);
OpenPOWER on IntegriCloud