[LV-kern-commit] CVS: kernel-2.4/arch/ia64/sn/io hcl.c,1.2,1.3 hubspc.c,1.2,1.3

[Dave A. <ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/arch/ia64/sn/io
In directory sc8-pr-cvs1:/tmp/cvs-serv7538/arch/ia64/sn/io

Modified Files:
	hcl.c hubspc.c 
Log Message:
DA: sync with Marcelo 2.4.17


Index: hcl.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ia64/sn/io/hcl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hcl.c	10 Apr 2002 14:27:22 -0000	1.2
+++ hcl.c	10 Jun 2003 01:13:14 -0000	1.3
@@ -1049,16 +1049,22 @@
 struct file_operations *
 hwgraph_cdevsw_get(devfs_handle_t de)
 {
-	return(devfs_get_ops(de));
+	struct file_operations *fops = devfs_get_ops(de);
+
+	devfs_put_ops(de); /*  FIXME: this may need to be moved to callers  */
+	return(fops);
 }
 
 /*
  * hwgraph_bdevsw_get - returns the fops of the given devfs entry.
 */
-struct file_operations *
+struct file_operations *    /*  FIXME: shouldn't this be a blkdev?  */
 hwgraph_bdevsw_get(devfs_handle_t de)
 {
-	return(devfs_get_ops(de));
+	struct file_operations *fops = devfs_get_ops(de);
+
+	devfs_put_ops(de); /*  FIXME: this may need to be moved to callers  */
+	return(fops);
 }
 
 /*

Index: hubspc.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/ia64/sn/io/hubspc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hubspc.c	10 Apr 2002 14:27:22 -0000	1.2
+++ hubspc.c	10 Jun 2003 01:13:14 -0000	1.3
@@ -61,7 +61,7 @@
 }cpuprom_info_t;
 
 static cpuprom_info_t	*cpuprom_head;
-spinlock_t	cpuprom_spinlock;
+static spinlock_t	cpuprom_spinlock;
 #define	PROM_LOCK()	mutex_spinlock(&cpuprom_spinlock)
 #define	PROM_UNLOCK(s)	mutex_spinunlock(&cpuprom_spinlock, (s))