From 3866aff83312d1b7f0812c64d9ac3a526bf297f6 Mon Sep 17 00:00:00 2001
From: Russ Anderson <(rja@sgi.com)>
Date: Mon, 9 May 2005 15:03:00 -0700
Subject: [PATCH] --- yaml --- r: 1709 b: refs/heads/master c:
 bb68c12b40c3c745381d7ce61d7b2e371f157505 h: refs/heads/master i:   1707:
 ce03ac7a41b72c1edab28c8f36a52002c30edc32 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/ia64/kernel/mca.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 32dc90ac6598..3eaab573fb38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 056b5033fb8d16095fb074fc910fad90186374f3
+refs/heads/master: bb68c12b40c3c745381d7ce61d7b2e371f157505
diff --git a/trunk/arch/ia64/kernel/mca.c b/trunk/arch/ia64/kernel/mca.c
index 4d6c7b8f667b..2c75741dcc66 100644
--- a/trunk/arch/ia64/kernel/mca.c
+++ b/trunk/arch/ia64/kernel/mca.c
@@ -1390,8 +1390,7 @@ ia64_mca_init(void)
 	register_percpu_irq(IA64_MCA_WAKEUP_VECTOR, &mca_wkup_irqaction);
 
 #ifdef CONFIG_ACPI
-	/* Setup the CPEI/P vector and handler */
-	cpe_vector = acpi_request_vector(ACPI_INTERRUPT_CPEI);
+	/* Setup the CPEI/P handler */
 	register_percpu_irq(IA64_CPEP_VECTOR, &mca_cpep_irqaction);
 #endif
 
@@ -1436,6 +1435,7 @@ ia64_mca_late_init(void)
 
 #ifdef CONFIG_ACPI
 	/* Setup the CPEI/P vector and handler */
+	cpe_vector = acpi_request_vector(ACPI_INTERRUPT_CPEI);
 	init_timer(&cpe_poll_timer);
 	cpe_poll_timer.function = ia64_mca_cpe_poll;