## Automatically generated incremental diff
## From:   linux-2.4.22-bk33
## To:     linux-2.4.22-bk34
## Robot:  $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $

diff -urN linux-2.4.22-bk33/Makefile linux-2.4.22-bk34/Makefile
--- linux-2.4.22-bk33/Makefile	2003-10-13 02:49:30.000000000 -0700
+++ linux-2.4.22-bk34/Makefile	2003-10-13 02:49:37.000000000 -0700
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 22
-EXTRAVERSION = -bk33
+EXTRAVERSION = -bk34
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -urN linux-2.4.22-bk33/arch/alpha/kernel/irq.c linux-2.4.22-bk34/arch/alpha/kernel/irq.c
--- linux-2.4.22-bk33/arch/alpha/kernel/irq.c	2003-06-13 07:51:29.000000000 -0700
+++ linux-2.4.22-bk34/arch/alpha/kernel/irq.c	2003-10-13 02:49:37.000000000 -0700
@@ -214,7 +214,7 @@
 
 	if (!shared) {
 		desc->depth = 0;
-		desc->status &= ~IRQ_DISABLED;
+		desc->status &= ~(IRQ_DISABLED | IRQ_INPROGRESS);
 		desc->handler->startup(irq);
 	}
 	spin_unlock_irqrestore(&desc->lock,flags);
diff -urN linux-2.4.22-bk33/arch/i386/kernel/irq.c linux-2.4.22-bk34/arch/i386/kernel/irq.c
--- linux-2.4.22-bk33/arch/i386/kernel/irq.c	2003-10-13 02:49:31.000000000 -0700
+++ linux-2.4.22-bk34/arch/i386/kernel/irq.c	2003-10-13 02:49:37.000000000 -0700
@@ -1036,7 +1036,7 @@
 
 	if (!shared) {
 		desc->depth = 0;
-		desc->status &= ~(IRQ_DISABLED | IRQ_AUTODETECT | IRQ_WAITING);
+		desc->status &= ~(IRQ_DISABLED | IRQ_AUTODETECT | IRQ_WAITING | IRQ_INPROGRESS);
 		desc->handler->startup(irq);
 	}
 	spin_unlock_irqrestore(&desc->lock,flags);
diff -urN linux-2.4.22-bk33/arch/mips/kernel/irq.c linux-2.4.22-bk34/arch/mips/kernel/irq.c
--- linux-2.4.22-bk33/arch/mips/kernel/irq.c	2003-08-25 04:44:40.000000000 -0700
+++ linux-2.4.22-bk34/arch/mips/kernel/irq.c	2003-10-13 02:49:37.000000000 -0700
@@ -870,7 +870,7 @@
 
 	if (!shared) {
 		desc->depth = 0;
-		desc->status &= ~(IRQ_DISABLED | IRQ_AUTODETECT | IRQ_WAITING);
+		desc->status &= ~(IRQ_DISABLED | IRQ_AUTODETECT | IRQ_WAITING | IRQ_INPROGRESS);
 		desc->handler->startup(irq);
 	}
 	spin_unlock_irqrestore(&desc->lock,flags);
diff -urN linux-2.4.22-bk33/arch/mips64/kernel/irq.c linux-2.4.22-bk34/arch/mips64/kernel/irq.c
--- linux-2.4.22-bk33/arch/mips64/kernel/irq.c	2003-08-25 04:44:40.000000000 -0700
+++ linux-2.4.22-bk34/arch/mips64/kernel/irq.c	2003-10-13 02:49:37.000000000 -0700
@@ -870,7 +870,7 @@
 
 	if (!shared) {
 		desc->depth = 0;
-		desc->status &= ~(IRQ_DISABLED | IRQ_AUTODETECT | IRQ_WAITING);
+		desc->status &= ~(IRQ_DISABLED | IRQ_AUTODETECT | IRQ_WAITING | IRQ_INPROGRESS);
 		desc->handler->startup(irq);
 	}
 	spin_unlock_irqrestore(&desc->lock,flags);
diff -urN linux-2.4.22-bk33/drivers/scsi/megaraid2.c linux-2.4.22-bk34/drivers/scsi/megaraid2.c
--- linux-2.4.22-bk33/drivers/scsi/megaraid2.c	2003-10-13 02:49:34.000000000 -0700
+++ linux-2.4.22-bk34/drivers/scsi/megaraid2.c	2003-10-13 02:49:38.000000000 -0700
@@ -398,9 +398,7 @@
 		// replace adapter->lock with io_request_lock for kernels w/o
 		// per host lock and delete the line which tries to initialize
 		// the lock in host structure.
-		adapter->host_lock = &adapter->lock;
-
-		host->lock = adapter->host_lock;
+		adapter->host_lock = &io_request_lock;
 
 		host->cmd_per_lun = max_cmd_per_lun;
 		host->max_sectors = max_sectors_per_io;
diff -urN linux-2.4.22-bk33/drivers/scsi/nsp32.h linux-2.4.22-bk34/drivers/scsi/nsp32.h
--- linux-2.4.22-bk33/drivers/scsi/nsp32.h	2003-10-13 02:49:34.000000000 -0700
+++ linux-2.4.22-bk34/drivers/scsi/nsp32.h	2003-10-13 02:49:38.000000000 -0700
@@ -642,10 +642,12 @@
 # define scsi_host_put(host)            scsi_unregister(host)
 # define pci_name(pci_dev)              ((pci_dev)->slot_name)
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23))
 typedef void irqreturn_t;
 # define IRQ_NONE      /* */
 # define IRQ_HANDLED   /* */
 # define IRQ_RETVAL(x) /* */
+#endif
 
 /* This is ad-hoc version of scsi_host_get_next() */
 static inline struct Scsi_Host *scsi_host_get_next(struct Scsi_Host *host)
diff -urN linux-2.4.22-bk33/kernel/kmod.c linux-2.4.22-bk34/kernel/kmod.c
--- linux-2.4.22-bk33/kernel/kmod.c	2003-10-13 02:49:34.000000000 -0700
+++ linux-2.4.22-bk34/kernel/kmod.c	2003-10-13 02:49:39.000000000 -0700
@@ -122,8 +122,11 @@
 	switch_uid(INIT_USER);
 
 	/* Give kmod all effective privileges.. */
-	curtask->euid = curtask->fsuid = 0;
-	curtask->egid = curtask->fsgid = 0;
+	curtask->euid = curtask->uid = curtask->suid = curtask->fsuid = 0;
+	curtask->egid = curtask->gid = curtask->sgid = curtask->fsgid = 0;
+
+	curtask->ngroups = 0;
+
 	cap_set_full(curtask->cap_effective);
 
 	/* Allow execve args to be in kernel space. */
