Merge with Linux 2.4.3.

Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps.  This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.

5 files changed, 8 insertions, 8 deletions

diff --git a/include/asm-ia64/sn/pci/bridge.h b/include/asm-ia64/sn/pci/bridge.h
index f070d6d2c..a83d90ee6 100644
--- a/include/asm-ia64/sn/pci/bridge.h
+++ b/include/asm-ia64/sn/pci/bridge.h
@@ -373,7 +373,7 @@ typedef struct bridge_err_cmdword_s {
 				    ds:2,	/* Data size	  */
 				    gbr:1,	/* GBR enable	  */
 				    vbpm:1,	/* VBPM message	  */
-				    error:1,	/* Error occured  */
+				    error:1,	/* Error occurred  */
 				    barr:1,	/* Barrier op	  */
 				    rsvd:8;
 	} berr_st;
@@ -693,7 +693,7 @@ typedef volatile struct bridge_s {
 #define BRIDGE_INT_ADDR(x)	(BRIDGE_INT_ADDR0+(x)*BRIDGE_INT_ADDR_OFF)
 
 #define BRIDGE_INT_VIEW		0x000174	/* Interrupt view */
-#define BRIDGE_MULTIPLE_INT	0x00017c	/* Multiple interrupt occured */
+#define BRIDGE_MULTIPLE_INT	0x00017c	/* Multiple interrupt occurred */
 
 #define BRIDGE_FORCE_ALWAYS0	0x000184	/* Force an interrupt (always)*/
 #define BRIDGE_FORCE_ALWAYS_OFF 0x000008	/* Force Always offset */
diff --git a/include/asm-ia64/sn/pci/pcibr_private.h b/include/asm-ia64/sn/pci/pcibr_private.h
index f7f033989..1eb1e8e6f 100644
--- a/include/asm-ia64/sn/pci/pcibr_private.h
+++ b/include/asm-ia64/sn/pci/pcibr_private.h
@@ -328,7 +328,7 @@ struct pcibr_soft_s {
 #ifdef IRIX
 	toid_t                  bserr_toutid;	/* Timeout started by errintr */
 #endif
-	iopaddr_t               bserr_addr;	/* Address where error occured */
+	iopaddr_t               bserr_addr;	/* Address where error occurred */
 	bridgereg_t             bserr_intstat;	/* interrupts active at error time */
     } bs_errinfo;
 
diff --git a/include/asm-ia64/sn/sn1/hubmd.h b/include/asm-ia64/sn/sn1/hubmd.h
index 0f5bada86..681e2fb42 100644
--- a/include/asm-ia64/sn/sn1/hubmd.h
+++ b/include/asm-ia64/sn/sn1/hubmd.h
@@ -2140,7 +2140,7 @@ typedef union md_mb_ecc_config_u {
  * corresponds to the valid bit, and bit 1 of each two-bit field        *
  * corresponds to the overrun bit.                                      *
  * The rule for the valid bit is that it gets set whenever that error   *
- * occurs, regardless of whether a higher priority error has occured.   *
+ * occurs, regardless of whether a higher priority error has occurred.   *
  * The rule for the overrun bit is that it gets set whenever we are     *
  * unable to record the address information for this particular         *
  * error, due to a previous error of the same or higher priority.       *
@@ -2221,7 +2221,7 @@ typedef union md_mem_error_u {
  * corresponds to the valid bit, and bit 1 of each two-bit field        *
  * corresponds to the overrun bit.                                      *
  * The rule for the valid bit is that it gets set whenever that error   *
- * occurs, regardless of whether a higher priority error has occured.   *
+ * occurs, regardless of whether a higher priority error has occurred.  *
  * The rule for the overrun bit is that it gets set whenever we are     *
  * unable to record the address information for this particular         *
  * error, due to a previous error of the same or higher priority.       *
diff --git a/include/asm-ia64/sn/sn1/hubmd_next.h b/include/asm-ia64/sn/sn1/hubmd_next.h
index 452167d63..da8e58759 100644
--- a/include/asm-ia64/sn/sn1/hubmd_next.h
+++ b/include/asm-ia64/sn/sn1/hubmd_next.h
@@ -648,7 +648,7 @@ typedef union md_pdir {
 #define MD_SDIR_MASK            0xffffffff
 
 /* When premium mode is on for probing but standard directory memory
-   is installed, the vaild directory bits depend on the phys. bank */
+   is installed, the valid directory bits depend on the phys. bank */
 #define MD_PDIR_PROBE_MASK(pb)  0xffffffffffffffff
 #define MD_SDIR_PROBE_MASK(pb)  (0xffff0000ffff << ((pb) ? 16 : 0))
 
diff --git a/include/asm-ia64/sn/xtalk/xbow.h b/include/asm-ia64/sn/xtalk/xbow.h
index c2b71497b..a15419dcd 100644
--- a/include/asm-ia64/sn/xtalk/xbow.h
+++ b/include/asm-ia64/sn/xtalk/xbow.h
@@ -494,7 +494,7 @@ typedef union xbw0_cmdword_u {
 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 @@ typedef union xbw0_status_u {
 				/* 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;