Skip to contentSkip to conversation

SN cleanups

PATCH New Jesse Barnes 1 participant 1 message May 19, 2003

lore
Share & tools
lore

Jesse Barnes

author
#0 lore raw

PATCH 1/1 SN cleanups

Some patches from [email protected] cleaning up sn2 code a bit, including the removal of some unnecessary files.

 arch/ia64/sn/io/drivers/hubdev.c         |  100 ---
 arch/ia64/sn/io/hwgdfs/Makefile          |   12 
 arch/ia64/sn/io/hwgdfs/hcl.c             |  955 -------------------------------
 arch/ia64/sn/io/hwgdfs/hcl_util.c        |  200 ------
 arch/ia64/sn/io/hwgdfs/invent_stub.c     |  146 ----
 arch/ia64/sn/io/hwgdfs/labelcl.c         |  653 ---------------------
 arch/ia64/sn/io/hwgfs/hwgfs.h            |   23 
 arch/ia64/Kconfig                      |   28 
 arch/ia64/sn/io/Makefile               |   12 
 arch/ia64/sn/io/drivers/Makefile       |    2 
 arch/ia64/sn/io/drivers/ifconfig_net.c |    2 
 arch/ia64/sn/io/drivers/ioconfig_bus.c |    2 
 arch/ia64/sn/io/hwgfs/hcl.c            |    2 
 arch/ia64/sn/io/sn2/klgraph.c          |    2 
 arch/ia64/sn/io/sn2/l1.c               |    1 
 arch/ia64/sn/io/sn2/ml_SN_init.c       |    3 
 arch/ia64/sn/io/sn2/ml_iograph.c       |    3 
 arch/ia64/sn/io/sn2/pcibr/Makefile     |    6 
 arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c  |    2 
 arch/ia64/sn/io/sn2/shuberror.c        |    6 
 arch/ia64/sn/io/sn2/xbow.c             |    2 
 arch/ia64/sn/kernel/Makefile           |    3 
 include/asm-ia64/sn/hwgfs.h            |    2 
 include/asm-ia64/sn/sn2/shubio.h       |    9 
 24 files changed, 31 insertions(+), 2145 deletions(-)

Thanks,
Jesse

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.1091 -> 1.1092
# arch/ia64/Kconfig 1.22 -> 1.23
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/05/19 [email protected] 1.1092

# remove SN1 options from KConfig
# --------------------------------------------
#
diff -Nru a/arch/ia64/Kconfig b/arch/ia64/Kconfig
--- a/arch/ia64/Kconfig	Mon May 19 12:41:52 2003
+++ b/arch/ia64/Kconfig	Mon May 19 12:41:52 2003
@@ -63,7 +63,7 @@
 	  HP-simulator   For the HP simulator
 	  (<http://software.hp.com/ia64linux/>).
 	  HP-zx1         For HP zx1-based systems.
-	  SN1-simulator  For the SGI SN1 simulator.
+	  SGI-SN2	 For SGI Altix systems
 	  DIG-compliant  For DIG ("Developer's Interface Guide") compliant
 	  systems.

@@ -187,8 +187,8 @@

 # align cache-sensitive data to 128 bytes
 config IA64_L1_CACHE_SHIFT
 	int
-	default "7" if MCKINLEY || ITANIUM && IA64_SGI_SN1
-	default "6" if ITANIUM && !IA64_SGI_SN1
+	default "7" if MCKINLEY
+	default "6" if ITANIUM
 # align cache-sensitive data to 64 bytes
 config MCKINLEY_ASTEP_SPECIFIC
@@ -207,7 +207,7 @@

config NUMA
bool "Enable NUMA support" if IA64_GENERIC || IA64_DIG || IA64_HP_ZX1
- default y if IA64_SGI_SN1 || IA64_SGI_SN2
+ default y if IA64_SGI_SN2
help
Say Y to compile the kernel to support NUMA (Non-Uniform Memory Access). This option is for configuring high-end multiprocessor
@@ -231,7 +231,7 @@

config DISCONTIGMEM
bool

-	depends on IA64_SGI_SN1 || IA64_SGI_SN2 || (IA64_GENERIC || IA64_DIG || IA64_HP_ZX1) && NUMA
+	depends on IA64_SGI_SN2 || (IA64_GENERIC || IA64_DIG || IA64_HP_ZX1) && NUMA

default y
help
Say Y to support efficient handling of discontiguous physical memory,
@@ -256,7 +256,7 @@

config IA64_MCA
bool "Enable IA-64 Machine Check Abort" if IA64_GENERIC || IA64_DIG || IA64_HP_ZX1
- default y if IA64_SGI_SN1 || IA64_SGI_SN2
+ default y if IA64_SGI_SN2
help
Say Y here to enable machine check support for IA-64. If you're unsure, answer Y.
@@ -290,17 +290,17 @@

config IA64_SGI_SN
bool
- depends on IA64_SGI_SN1 || IA64_SGI_SN2
+ depends on IA64_SGI_SN2
default y

config HWGFS_FS
bool
- depends on IA64_SGI_SN1 || IA64_SGI_SN2
+ depends on IA64_SGI_SN2
default y

config IA64_SGI_SN_DEBUG
bool "Enable extra debugging code"
- depends on IA64_SGI_SN1 || IA64_SGI_SN2
+ depends on IA64_SGI_SN2
help
Turns on extra debugging code in the SGI SN (Scalable NUMA) platform for IA-64. Unless you are debugging problems on an SGI SN IA-64 box,
@@ -308,14 +308,14 @@

config IA64_SGI_SN_SIM
bool "Enable SGI Medusa Simulator Support"
- depends on IA64_SGI_SN1 || IA64_SGI_SN2
+ depends on IA64_SGI_SN2
help
If you are compiling a kernel that will run under SGI's IA-64 simulator (Medusa) then say Y, otherwise say N.

config IA64_SGI_AUTOTEST
bool "Enable autotest (llsc). Option to run cache test instead of booting"
- depends on IA64_SGI_SN1 || IA64_SGI_SN2
+ depends on IA64_SGI_SN2
help
Build a kernel used for hardware validation. If you include the keyword "autotest" on the boot command line, the kernel does NOT boot.
@@ -325,7 +325,7 @@

config SERIAL_SGI_L1_PROTOCOL
bool "Enable protocol mode for the L1 console"
- depends on IA64_SGI_SN1 || IA64_SGI_SN2
+ depends on IA64_SGI_SN2
help
Uses protocol mode instead of raw mode for the level 1 console on the SGI SN (Scalable NUMA) platform for IA-64. If you are compiling for
@@ -333,12 +333,12 @@

config PERCPU_IRQ
bool
- depends on IA64_SGI_SN1 || IA64_SGI_SN2
+ depends on IA64_SGI_SN2
default y

config PCIBA
tristate "PCIBA support"
- depends on IA64_SGI_SN1 || IA64_SGI_SN2
+ depends on IA64_SGI_SN2
help
IRIX PCIBA-inspired user mode PCI interface for the SGI SN (Scalable NUMA) platform for IA-64. Unless you are compiling a kernel for an
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.1092 -> 1.1093
# arch/ia64/sn/kernel/Makefile 1.12 -> 1.13
# include/asm-ia64/sn/hwgfs.h 1.1 -> 1.2
# arch/ia64/sn/io/Makefile 1.12 -> 1.13
# arch/ia64/sn/io/hwgdfs/labelcl.c 1.5 -> (deleted)
# arch/ia64/sn/io/hwgdfs/Makefile 1.1 -> (deleted)
# arch/ia64/sn/io/hwgdfs/invent_stub.c 1.1 -> (deleted)
# arch/ia64/sn/io/hwgdfs/hcl_util.c 1.5 -> (deleted)
# arch/ia64/sn/io/hwgdfs/hcl.c 1.9 -> (deleted)
# arch/ia64/sn/io/hwgfs/hwgfs.h 1.1 -> (deleted)
# arch/ia64/sn/io/sn2/pcibr/Makefile 1.3 -> 1.4
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/05/19 [email protected] 1.1093

# hwgfs & config option cleanups
# --------------------------------------------
#
diff -Nru a/arch/ia64/sn/io/Makefile b/arch/ia64/sn/io/Makefile
--- a/arch/ia64/sn/io/Makefile	Mon May 19 12:42:08 2003
+++ b/arch/ia64/sn/io/Makefile	Mon May 19 12:42:08 2003
@@ -11,13 +11,5 @@

EXTRA_CFLAGS := -DLITTLE_ENDIAN -DSHUB_SWAP_WAR

-obj-$(CONFIG_IA64_SGI_SN) += sgi_if.o xswitch.o sgi_io_sim.o cdl.o ate_utils.o \
- io.o machvec/ drivers/ platform_init/
-
-obj-$(CONFIG_IA64_SGI_SN2) += sn2/
-
-ifdef CONFIG_HWGFS_FS
-obj-$(CONFIG_HWGFS_FS) += hwgfs/
-else
-obj-$(CONFIG_DEVFS_FS) += hwgdfs/
-endif
+obj-y += sgi_if.o xswitch.o sgi_io_sim.o cdl.o ate_utils.o \
+ io.o machvec/ drivers/ platform_init/ sn2/ hwgfs/
\ No newline at end of file

arch/ia64/sn/io/hwgdfs/Makefile deleted +0 -12
diff -Nru a/arch/ia64/sn/io/hwgdfs/Makefile b/arch/ia64/sn/io/hwgdfs/Makefile
@@ -1,12 +0,0 @@
-#
-# This file is subject to the terms and conditions of the GNU General Public
-# License.  See the file "COPYING" in the main directory of this archive
-# for more details.
-#
-# Copyright (C) 2002-2003 Silicon Graphics, Inc.  All Rights Reserved.
-#
-# Makefile for the sn2 io routines.
-
-EXTRA_CFLAGS    := -DLITTLE_ENDIAN
-
-obj-y				+= hcl.o labelcl.o hcl_util.o invent_stub.o
arch/ia64/sn/io/hwgdfs/hcl.c deleted +0 -955

955 lines not on this page · raw message

arch/ia64/sn/io/hwgdfs/hcl_util.c deleted +0 -200

200 lines not on this page · raw message

arch/ia64/sn/io/hwgdfs/invent_stub.c deleted +0 -146

146 lines not on this page · raw message

arch/ia64/sn/io/hwgdfs/labelcl.c deleted +0 -653

653 lines not on this page · raw message

arch/ia64/sn/io/hwgfs/hwgfs.h deleted +0 -23
diff -Nru a/arch/ia64/sn/io/hwgfs/hwgfs.h b/arch/ia64/sn/io/hwgfs/hwgfs.h
@@ -1,23 +0,0 @@
-
-typedef struct dentry *hwgfs_handle_t;
-
-extern hwgfs_handle_t hwgfs_register(hwgfs_handle_t dir, const char *name,
-				     unsigned int flags,
-				     unsigned int major, unsigned int minor,
-				     umode_t mode, void *ops, void *info);
-extern int hwgfs_mk_symlink(hwgfs_handle_t dir, const char *name,
-			     unsigned int flags, const char *link,
-			     hwgfs_handle_t *handle, void *info);
-extern hwgfs_handle_t hwgfs_mk_dir(hwgfs_handle_t dir, const char *name,
-				    void *info);
-extern void hwgfs_unregister(hwgfs_handle_t de);
-
-extern hwgfs_handle_t hwgfs_find_handle(hwgfs_handle_t dir, const char *name,
-					unsigned int major,unsigned int minor,
-					char type, int traverse_symlinks);
-extern hwgfs_handle_t hwgfs_get_parent(hwgfs_handle_t de);
-extern int hwgfs_generate_path(hwgfs_handle_t de, char *path, int buflen);
-
-extern void *hwgfs_get_info(hwgfs_handle_t de);
-extern int hwgfs_set_info(hwgfs_handle_t de, void *info);
-
arch/ia64/sn/io/sn2/pcibr/Makefile +2 -4
diff -Nru a/arch/ia64/sn/io/sn2/pcibr/Makefile b/arch/ia64/sn/io/sn2/pcibr/Makefile
@@ -11,7 +11,5 @@
 
 EXTRA_CFLAGS    := -DLITTLE_ENDIAN -DSHUB_SWAP_WAR
 
-obj-$(CONFIG_IA64_SGI_SN2)	+= pcibr_ate.o pcibr_config.o \
-                                   pcibr_dvr.o pcibr_hints.o \
-				   pcibr_intr.o pcibr_rrb.o pcibr_slot.o \
-				   pcibr_error.o
+obj-y += pcibr_ate.o pcibr_config.o pcibr_dvr.o pcibr_hints.o pcibr_intr.o pcibr_rrb.o \
+	 pcibr_slot.o pcibr_error.o
arch/ia64/sn/kernel/Makefile +1 -2
diff -Nru a/arch/ia64/sn/kernel/Makefile b/arch/ia64/sn/kernel/Makefile
@@ -9,8 +9,7 @@
 
 EXTRA_CFLAGS := -DLITTLE_ENDIAN
 
-obj-y				:= probe.o setup.o sv.o bte.o irq.o mca.o
+obj-y				:= probe.o setup.o sv.o bte.o irq.o mca.o sn2/
 
-obj-$(CONFIG_IA64_SGI_SN2)      += sn2/
 obj-$(CONFIG_IA64_GENERIC)      += machvec.o
 obj-$(CONFIG_MODULES)           += sn_ksyms.o
include/asm-ia64/sn/hwgfs.h +0 -2
diff -Nru a/include/asm-ia64/sn/hwgfs.h b/include/asm-ia64/sn/hwgfs.h
@@ -10,8 +10,6 @@
  * Copyright (C) 1992 - 1997, 2000-2003 Silicon Graphics, Inc. All rights reserved.
  */
 
-#define DEVFS_FL_AUTO_DEVNUM 0
-
 typedef struct dentry *hwgfs_handle_t;
 
 extern hwgfs_handle_t hwgfs_register(hwgfs_handle_t dir, const char *name,

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.1094 -> 1.1095

#	arch/ia64/sn/io/sn2/ml_iograph.c	1.2     -> 1.3    
#	arch/ia64/sn/io/sn2/ml_SN_init.c	1.2     -> 1.3    
#	include/asm-ia64/sn/sn2/shubio.h	1.3     -> 1.4    
#	arch/ia64/sn/io/drivers/hubdev.c	1.5     ->         (deleted)      
#	arch/ia64/sn/io/drivers/Makefile	1.1     -> 1.2

#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/05/19 [email protected] 1.1095

# remove unneeded hubdev stuff
# --------------------------------------------
#
diff -Nru a/arch/ia64/sn/io/drivers/Makefile b/arch/ia64/sn/io/drivers/Makefile
--- a/arch/ia64/sn/io/drivers/Makefile	Mon May 19 12:42:20 2003
+++ b/arch/ia64/sn/io/drivers/Makefile	Mon May 19 12:42:20 2003
@@ -9,6 +9,6 @@

EXTRA_CFLAGS := -DLITTLE_ENDIAN

-obj-y += hubdev.o ioconfig_bus.o ifconfig_net.o
+obj-y += ioconfig_bus.o ifconfig_net.o

obj-$(CONFIG_PCIBA) += pciba.o

arch/ia64/sn/io/drivers/hubdev.c deleted +0 -100

100 lines not on this page · raw message

arch/ia64/sn/io/sn2/ml_SN_init.c +0 -3
diff -Nru a/arch/ia64/sn/io/sn2/ml_SN_init.c b/arch/ia64/sn/io/sn2/ml_SN_init.c
@@ -62,9 +62,6 @@
 
 	/* early initialization of iograph */
 	iograph_early_init();
-
-	/* Initialize Hub Pseudodriver Management */
-	hubdev_init();
 }
arch/ia64/sn/io/sn2/ml_iograph.c +0 -3
diff -Nru a/arch/ia64/sn/io/sn2/ml_iograph.c b/arch/ia64/sn/io/sn2/ml_iograph.c
@@ -655,7 +655,6 @@
 	struct semaphore *peer_sema = 0;
 	uint32_t	widget_partnum;
 	cpu_cookie_t	c = 0;
-	extern int hubdev_docallouts(vertex_hdl_t);
 
 	npdap = NODEPDA(cnodeid);
 

@@ -670,8 +669,6 @@
 	DBG("io_init_node: Initialize IO for cnode %d hubv(node) 0x%p npdap 0x%p\n", cnodeid, hubv, npdap);
 
 	ASSERT(hubv != GRAPH_VERTEX_NONE);
-
-	hubdev_docallouts(hubv);
 
 	/*
 	 * Read mfg info on this hub
include/asm-ia64/sn/sn2/shubio.h +0 -9
diff -Nru a/include/asm-ia64/sn/sn2/shubio.h b/include/asm-ia64/sn/sn2/shubio.h
@@ -3629,15 +3629,6 @@
 extern int hub_error_devenable(vertex_hdl_t, int, int);
 extern int  hub_dma_enabled(vertex_hdl_t);
 
-/* hubdev */
-extern void hubdev_init(void);
-extern void hubdev_register(int (*attach_method)(vertex_hdl_t));
-extern int hubdev_unregister(int (*attach_method)(vertex_hdl_t));
-extern int hubdev_docallouts(vertex_hdl_t hub);
-
-extern caddr_t hubdev_prombase_get(vertex_hdl_t hub);
-extern cnodeid_t hubdev_cnodeid_get(vertex_hdl_t hub);
-
 #endif /* __ASSEMBLY__ */
 #endif /* _KERNEL */
 #endif /* _ASM_IA64_SN_SN2_SHUBIO_H */

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.1095 -> 1.1096
# arch/ia64/sn/io/drivers/ifconfig_net.c 1.5 -> 1.6
# arch/ia64/sn/io/sn2/xbow.c 1.2 -> 1.3
# arch/ia64/sn/io/hwgfs/hcl.c 1.1 -> 1.2
# arch/ia64/sn/io/sn2/klgraph.c 1.2 -> 1.3
# arch/ia64/sn/io/drivers/ioconfig_bus.c 1.2 -> 1.3
# arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c 1.8 -> 1.9
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/05/19 [email protected] 1.1096
# DEVFS_FL_AUTO_DEVNUM removal
# --------------------------------------------
#

arch/ia64/sn/io/drivers/ifconfig_net.c +1 -1
diff -Nru a/arch/ia64/sn/io/drivers/ifconfig_net.c b/arch/ia64/sn/io/drivers/ifconfig_net.c
@@ -284,7 +284,7 @@
 {
 	ifconfig_net_handle = NULL;
 	ifconfig_net_handle = hwgraph_register(hwgraph_root, ".ifconfig_net",
-			0, DEVFS_FL_AUTO_DEVNUM,
+ 		        0, 0,
 			0, 0,
 			S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP, 0, 0,
 			&ifconfig_net_fops, NULL);
arch/ia64/sn/io/drivers/ioconfig_bus.c +1 -1
diff -Nru a/arch/ia64/sn/io/drivers/ioconfig_bus.c b/arch/ia64/sn/io/drivers/ioconfig_bus.c
@@ -361,7 +361,7 @@
 {
 	ioconfig_bus_handle = NULL;
 	ioconfig_bus_handle = hwgraph_register(hwgraph_root, ".ioconfig_bus",
-			0, DEVFS_FL_AUTO_DEVNUM,
+		        0, 0,
 			0, 0,
 			S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP, 0, 0,
 			&ioconfig_bus_fops, NULL);
arch/ia64/sn/io/hwgfs/hcl.c +1 -1
diff -Nru a/arch/ia64/sn/io/hwgfs/hcl.c b/arch/ia64/sn/io/hwgfs/hcl.c
@@ -164,7 +164,7 @@
 	 *
 	 */
 	hcl_handle = hwgraph_register(hwgraph_root, ".hcl",
-			0, DEVFS_FL_AUTO_DEVNUM,
+		        0, 0,
 			0, 0,
 			S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP, 0, 0,
 			&hcl_fops, NULL);
arch/ia64/sn/io/sn2/klgraph.c +1 -1
diff -Nru a/arch/ia64/sn/io/sn2/klgraph.c b/arch/ia64/sn/io/sn2/klgraph.c
@@ -216,7 +216,7 @@
 	(void) hwgraph_path_add(node_vertex, EDGE_LBL_HUB, &myhubv);
 	rc = device_master_set(myhubv, node_vertex);
 	hub_mon = hwgraph_register(myhubv, EDGE_LBL_PERFMON,
-		0, DEVFS_FL_AUTO_DEVNUM,
+		0, 0,
 		0, 0,
 		S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP, 0, 0,
 		&shub_mon_fops, (void *)(long)cnode);
arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c +1 -1
diff -Nru a/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c
@@ -1215,7 +1215,7 @@
 
     ctlr_vhdl = NULL;
     ctlr_vhdl = hwgraph_register(pcibr_vhdl, EDGE_LBL_CONTROLLER, 0, 
-                DEVFS_FL_AUTO_DEVNUM, 0, 0,
+                0, 0, 0,
 		S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP, 0, 0, 
 		(struct file_operations *)&pcibr_fops, (void *)pcibr_vhdl);
     ASSERT(ctlr_vhdl != NULL);
arch/ia64/sn/io/sn2/xbow.c +1 -1
diff -Nru a/arch/ia64/sn/io/sn2/xbow.c b/arch/ia64/sn/io/sn2/xbow.c
@@ -289,7 +289,7 @@
      */
     vhdl = NULL;
     vhdl = hwgraph_register(conn, EDGE_LBL_XBOW, 0,
-	   DEVFS_FL_AUTO_DEVNUM, 0, 0,
+	   0, 0, 0,
 	   S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP, 0, 0,
 	   (struct file_operations *)&xbow_fops, (void *)xbow);
     if (!vhdl) {

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.1096 -> 1.1097
# arch/ia64/sn/io/sn2/l1.c 1.2 -> 1.3
# arch/ia64/sn/io/sn2/shuberror.c 1.3 -> 1.4
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/05/19 [email protected] 1.1097

# fixup warnings (irqreturn_t and interrupt.h)
# --------------------------------------------
#
diff -Nru a/arch/ia64/sn/io/sn2/l1.c b/arch/ia64/sn/io/sn2/l1.c
--- a/arch/ia64/sn/io/sn2/l1.c	Mon May 19 12:42:56 2003
+++ b/arch/ia64/sn/io/sn2/l1.c	Mon May 19 12:42:56 2003
@@ -29,6 +29,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/delay.h>
+#include <linux/interrupt.h>
 #include <asm/io.h>
 #include <asm/sn/sgi.h>
 #include <asm/sn/io.h>
diff -Nru a/arch/ia64/sn/io/sn2/shuberror.c b/arch/ia64/sn/io/sn2/shuberror.c
--- a/arch/ia64/sn/io/sn2/shuberror.c	Mon May 19 12:42:56 2003
+++ b/arch/ia64/sn/io/sn2/shuberror.c	Mon May 19 12:42:56 2003
@@ -35,7 +35,7 @@

extern void hubni_eint_init(cnodeid_t cnode);
extern void hubii_eint_init(cnodeid_t cnode);
-extern void hubii_eint_handler (int irq, void *arg, struct pt_regs *ep);
+extern irqreturn_t hubii_eint_handler (int irq, void *arg, struct pt_regs *ep);
int hubiio_crb_error_handler(vertex_hdl_t hub_v, hubinfo_t hinfo);
int hubiio_prb_error_handler(vertex_hdl_t hub_v, hubinfo_t hinfo);
extern void bte_crb_error_handler(vertex_hdl_t hub_v, int btenum, int crbnum, ioerror_t *ioe, int bteop);
@@ -168,7 +168,7 @@

/*ARGSUSED*/
-void
+irqreturn_t
hubii_eint_handler (int irq, void *arg, struct pt_regs *ep)

 {
     vertex_hdl_t	hub_v;
@@ -263,6 +263,8 @@
      */
     (void)hubiio_crb_error_handler(hub_v, hinfo);
     (void)hubiio_prb_error_handler(hub_v, hinfo);

+
+ return IRQ_HANDLED;
}

/*