[IA64-SGI] Altix only: Register Error Interrupt

The following patch ensures that the correct error interrupt handling 
routine is initialized.  This patch is based on the 2.6.12 ia64 release tree.

Signed-off-by: Colin Ngam <cngam@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 18160a06a8c9..9e07f5463f21 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -174,6 +174,12 @@ static void sn_fixup_ionodes(void)
                 if (status)
                         continue;
 
+                /* Attach the error interrupt handlers */
+                if (nasid & 1)
+                        ice_error_init(hubdev);
+                else
+                        hub_error_init(hubdev);
+
                 for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++)
                         hubdev->hdi_xwidget_info[widget].xwi_hubinfo = hubdev;
 
@@ -211,10 +217,6 @@ static void sn_fixup_ionodes(void)
                             sn_flush_device_list;
                 }
 
-                if (!(i & 1))
-                        hub_error_init(hubdev);
-                else
-                        ice_error_init(hubdev);
         }
 
 }