[LV-kern-commit] CVS: kernel-2.4/include/asm-ia64/sn/xtalk xbow.h,1.1.1.1,1.2 xbow_info.h,1.1.1.1,1.2 xswitch.h,1.1.1.1,1.2 xtalk.h,1.1.1.1,1.2 xtalk_private.h,1.1.1.1,1.2 xtalkaddrs.h,1.1.1.1,1.2 xwidget.h,1.1.1.1,1.2

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/xtalk
In directory usw-pr-cvs1:/tmp/cvs-serv9454/asm-ia64/sn/xtalk

Modified Files:
	xbow.h xbow_info.h xswitch.h xtalk.h xtalk_private.h 
	xtalkaddrs.h xwidget.h 
Log Message:
Synch to 2.4.15 commit 1


Index: xbow.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/xtalk/xbow.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- xbow.h	14 Jan 2001 17:03:46 -0000	1.1.1.1
+++ xbow.h	9 Apr 2002 12:33:13 -0000	1.2
@@ -494,7 +494,7 @@
 typedef union xbw0_status_u {
     xbowreg_t               statusword;
     struct {
-       uint32_t		mult_err:1,	/* Multiple error occured */
+       uint32_t		mult_err:1,	/* Multiple error occurred */
                                 connect_tout:1, /* Connection timeout   */
                                 xtalk_err:1,    /* Xtalk pkt with error bit */
                                 /* End of Xbridge only */
@@ -524,7 +524,7 @@
 				/* End of Xbridge only */
 				xtalk_err:1,	/* Xtalk pkt with error bit */
 				connect_tout:1, /* Connection timeout	*/
-				mult_err:1;	/* Multiple error occured */
+				mult_err:1;	/* Multiple error occurred */
     } xbw0_stfield;
 } xbw0_status_t;
 

Index: xbow_info.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/xtalk/xbow_info.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: xswitch.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/xtalk/xswitch.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: xtalk.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/xtalk/xtalk.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- xtalk.h	14 Jan 2001 17:03:49 -0000	1.1.1.1
+++ xtalk.h	9 Apr 2002 12:33:13 -0000	1.2
@@ -278,6 +278,7 @@
 
     /* INTERRUPT MANAGEMENT */
     xtalk_intr_alloc_f     *intr_alloc;
+    xtalk_intr_alloc_f     *intr_alloc_nothd;
     xtalk_intr_free_f      *intr_free;
     xtalk_intr_connect_f   *intr_connect;
     xtalk_intr_disconnect_f *intr_disconnect;
@@ -308,6 +309,7 @@
 extern xtalk_dmaaddr_drain_f xtalk_dmaaddr_drain;
 extern xtalk_dmalist_drain_f xtalk_dmalist_drain;
 extern xtalk_intr_alloc_f xtalk_intr_alloc;
+extern xtalk_intr_alloc_f xtalk_intr_alloc_nothd;
 extern xtalk_intr_free_f xtalk_intr_free;
 extern xtalk_intr_connect_f xtalk_intr_connect;
 extern xtalk_intr_disconnect_f xtalk_intr_disconnect;
@@ -342,10 +344,6 @@
 extern iopaddr_t        xtalk_intr_addr_get(xtalk_intr_t xtalk_intr);
 extern devfs_handle_t     xtalk_intr_cpu_get(xtalk_intr_t xtalk_intr);
 extern void            *xtalk_intr_sfarg_get(xtalk_intr_t xtalk_intr);
-
-extern int		xtalk_intr_flags_get(xtalk_intr_t xtalk_intr);
-/* XTALK_INTR flags */
-#define XTALK_INTR_NOTHREAD	1	/* interrupt handler wants to be called at interrupt level */
 
 /* Generic crosstalk pio interfaces */
 extern devfs_handle_t     xtalk_pio_dev_get(xtalk_piomap_t xtalk_piomap);

Index: xtalk_private.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/xtalk/xtalk_private.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- xtalk_private.h	14 Jan 2001 17:03:49 -0000	1.1.1.1
+++ xtalk_private.h	9 Apr 2002 12:33:13 -0000	1.2
@@ -10,11 +10,7 @@
 #ifndef _ASM_SN_XTALK_XTALK_PRIVATE_H
 #define _ASM_SN_XTALK_XTALK_PRIVATE_H
 
-#ifdef IRIX
-#include <sys/ioerror.h>	/* for error function and arg types */
-#else
 #include <asm/sn/ioerror.h>        /* for error function and arg types */
-#endif
 
 /*
  * xtalk_private.h -- private definitions for xtalk
@@ -44,7 +40,6 @@
  * All Crosstalk providers set up interrupts using this information.
  */
 struct xtalk_intr_s {
-    int                     xi_flags;	/* XTALK_INTR flags */
     devfs_handle_t            xi_dev;	/* requestor of this intr */
     xwidgetnum_t            xi_target;	/* master's widget number */
     xtalk_intr_vector_t     xi_vector;	/* 8-bit interrupt vector */

Index: xtalkaddrs.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/xtalk/xtalkaddrs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- xtalkaddrs.h	14 Jan 2001 17:03:50 -0000	1.1.1.1
+++ xtalkaddrs.h	9 Apr 2002 12:33:13 -0000	1.2
@@ -10,6 +10,8 @@
 #ifndef _ASM_SN_XTALK_XTALKADDRS_H
 #define _ASM_SN_XTALK_XTALKADDRS_H
 
+#include <linux/config.h>
+
 /*
  * CrossTalk to SN0 Hub addressing support
  *
@@ -58,8 +60,6 @@
  * This looks very much like a REMOTE_HUB access, except the nodeID
  * is in a different place, and the highest xtalk bit is set.
  */
-
-#include <linux/config.h>
 
 /* Hub-specific xtalk definitions */
 

Index: xwidget.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-ia64/sn/xtalk/xwidget.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2