Linux 2.4.0-test9pre7

    - USB: remember to release the kernel lock and other updates..
    - recognize the k6 model 13: it's a K6-2+ mobile processor.
    - file locking deadlock detection bugfix..
    - NFSv3 is not really really experimental any more.
    - don't raise privileges when re-trying a failed NFS RPM request
    - alpha cross-compile fixes..
    - sound init cleanups
    - shm statistics bugfix.
    - nfsd: mark us as a O_LARGEFILE case, so that the VFS allows
      the full 64-bit access..
    - fix up ac97 codec initialization
    - Ingo: clean up VM handling, improve balancing.
    - add SGI PCI ID's.
    - export the new lock copy/init functions
    - cs4281 sound driver
    - official Compaq CISS driver.

Documentation/Configure.help

@@ -4913,6 +4913,14 @@ CONFIG_PHONE
   it as a module, say M here and read Documentation/modules.txt. The
   module will be called phonedev.o.
 
+Compaq Smart Array support
+CONFIG_BLK_CPQ_CISS_DA
+   This is the driver for Compaq Smart Array controllers.
+   Everyone using these boards should say Y here.
+   See "linux/Documentation/cciss.txt" for the current list of
+   boards supported by this driver, and for further information
+   on the use of this driver.
+
 QuickNet Internet LineJack/PhoneJack support
 CONFIG_PHONE_IXJ
   Say M if you have a telephony card manufactured by Quicknet

MAINTAINERS

@@ -210,13 +210,6 @@ M:	jgarzik@mandrakesoft.com
 L:	linux-fbdev@vuser.vu.union.edu
 S:	Maintained
 
-COMPAQ SMART CISS RAID DRIVER 
-P:      Charles White
-M:      Charles White <arrays@compaq.com>
-L:      compaqandlinux@cpqlin.van-dijk.net
-W:	ftp.compaq.com/pub/products/drivers/linux	
-S:     	Supported 
-
 COMPAQ FIBRE CHANNEL 64-bit/66MHz PCI non-intelligent HBA
 P:      Amy Vanzant-Hodge 
 M:      Amy Vanzant-Hodge (fibrechannel@compaq.com)
@@ -231,6 +224,13 @@ L:	compaqandlinux@cpqlin.van-dijk.net
 W:	ftp.compaq.com/pub/products/drivers/linux
 S:	Supported	
 
+COMPAQ SMART CISS RAID DRIVER 
+P:	Charles White
+M:	Charles White <arrays@compaq.com>
+L:	compaqandlinux@cpqlin.van-dijk.net
+W:	ftp.compaq.com/pub/products/drivers/linux	
+S:	Supported 
+
 COMPUTONE INTELLIPORT MULTIPORT CARD
 P:     Doug McNash
 P:     Michael H. Warfield

arch/alpha/Makefile

@@ -8,7 +8,7 @@
 # Copyright (C) 1994 by Linus Torvalds
 #
 
-NM := nm -B
+NM := $(NM) -B
 
 LINKFLAGS = -static -T arch/alpha/vmlinux.lds -N #-relax
 CFLAGS := $(CFLAGS) -pipe -mno-fp-regs -ffixed-8

arch/alpha/boot/Makefile

@@ -68,7 +68,7 @@ vmlinux.nh: $(VMLINUX) $(OBJSTRIP)
 	$(OBJSTRIP) -v $(VMLINUX) vmlinux.nh
 
 vmlinux: $(TOPDIR)/vmlinux
-	strip -o vmlinux $(VMLINUX)
+	$(STRIP) -o vmlinux $(VMLINUX)
 
 tools/lxboot: $(OBJSTRIP) bootloader
 	$(OBJSTRIP) -p bootloader tools/lxboot

arch/i386/defconfig

@@ -113,10 +113,10 @@ CONFIG_BLK_DEV_FD=y
 # CONFIG_BLK_DEV_XD is not set
 # CONFIG_PARIDE is not set
 # CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_BLK_DEV_INITRD is not set
 
@@ -599,6 +599,7 @@ CONFIG_SOUND=y
 # CONFIG_SOUND_CMPCI is not set
 # CONFIG_SOUND_EMU10K1 is not set
 # CONFIG_SOUND_FUSION is not set
+# CONFIG_SOUND_CS4281 is not set
 # CONFIG_SOUND_ES1370 is not set
 CONFIG_SOUND_ES1371=y
 # CONFIG_SOUND_ESSSOLO1 is not set

arch/i386/kernel/setup.c

@@ -875,7 +875,8 @@ static int __init amd_model(struct cpuinfo_x86 *c)
 	 * Set MTRR capability flag if appropriate
 	 */
 	if(boot_cpu_data.x86 == 5) {
-		if((boot_cpu_data.x86_model == 9) ||
+		if((boot_cpu_data.x86_model == 13) ||
+		   (boot_cpu_data.x86_model == 9) ||
 		   ((boot_cpu_data.x86_model == 8) && 
 		    (boot_cpu_data.x86_mask >= 8)))
 			c->x86_capability |= X86_FEATURE_MTRR;
@@ -916,7 +917,7 @@ static int __init amd_model(struct cpuinfo_x86 *c)
 				}
 				break;
 			}
-			if (c->x86_model == 8 || c->x86_model == 9)
+			if (c->x86_model == 8 || c->x86_model == 9 || c->x86_model == 13)
 			{
 				/* The more serious chips .. */
 				

arch/i386/kernel/signal.c

@@ -690,6 +690,13 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
 			}
 		}
 
+		/* Reenable any watchpoints before delivering the
+		 * signal to user space. The processor register will
+		 * have been cleared if the watchpoint triggered
+		 * inside the kernel.
+		 */
+		__asm__("movl %0,%%db7"	: : "r" (current->thread.debugreg[7]));
+
 		/* Whee!  Actually deliver the signal.  */
 		handle_signal(signr, ka, &info, oldset, regs);
 		return 1;

arch/i386/kernel/traps.c

@@ -492,17 +492,26 @@ asmlinkage void do_nmi(struct pt_regs * regs, long error_code)
 }
 
 /*
- * Careful - we must not do a lock-kernel until we have checked that the
- * debug fault happened in user mode. Getting debug exceptions while
- * in the kernel has to be handled without locking, to avoid deadlocks..
+ * Our handling of the processor debug registers is non-trivial.
+ * We do not clear them on entry and exit from the kernel. Therefore
+ * it is possible to get a watchpoint trap here from inside the kernel.
+ * However, the code in ./ptrace.c has ensured that the user can
+ * only set watchpoints on userspace addresses. Therefore the in-kernel
+ * watchpoint trap can only occur in code which is reading/writing
+ * from user space. Such code must not hold kernel locks (since it
+ * can equally take a page fault), therefore it is safe to call
+ * force_sig_info even though that claims and releases locks.
+ * 
+ * Code in ./signal.c ensures that the debug control register
+ * is restored before we deliver any signal, and therefore that
+ * user code runs with the correct debug control register even though
+ * we clear it here.
  *
  * Being careful here means that we don't have to be as careful in a
  * lot of more complicated places (task switching can be a bit lazy
  * about restoring all the debug state, and ptrace doesn't have to
  * find every occurrence of the TF bit that could be saved away even
- * by user code - and we don't have to be careful about what values
- * can be written to the debug registers because there are no really
- * bad cases).
+ * by user code)
  */
 asmlinkage void do_debug(struct pt_regs * regs, long error_code)
 {
@@ -539,30 +548,33 @@ asmlinkage void do_debug(struct pt_regs * regs, long error_code)
 			goto clear_TF;
 	}
 
-	/* If this is a kernel mode trap, we need to reset db7 to allow us to continue sanely */
-	if ((regs->xcs & 3) == 0)
-		goto clear_dr7;
-
 	/* Ok, finally something we can handle */
 	tsk->thread.trap_no = 1;
 	tsk->thread.error_code = error_code;
 	info.si_signo = SIGTRAP;
 	info.si_errno = 0;
 	info.si_code = TRAP_BRKPT;
-	info.si_addr = (void *)regs->eip;
+	
+	/* If this is a kernel mode trap, save the user PC on entry to 
+	 * the kernel, that's what the debugger can make sense of.
+	 */
+	info.si_addr = ((regs->xcs & 3) == 0) ? (void *)tsk->thread.eip : 
+	                                        (void *)regs->eip;
 	force_sig_info(SIGTRAP, &info, tsk);
-	return;
-
-debug_vm86:
-	handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code, 1);
-	return;
 
+	/* Disable additional traps. They'll be re-enabled when
+	 * the signal is delivered.
+	 */
 clear_dr7:
 	__asm__("movl %0,%%db7"
 		: /* no output */
 		: "r" (0));
 	return;
 
+debug_vm86:
+	handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code, 1);
+	return;
+
 clear_TF:
 	regs->eflags &= ~TF_MASK;
 	return;

drivers/block/Config.in

@@ -34,15 +34,12 @@ if [ "$CONFIG_PARIDE" = "y" -o "$CONFIG_PARIDE" = "m" ]; then
    source drivers/block/paride/Config.in
 fi
 dep_tristate 'Compaq SMART2 support' CONFIG_BLK_CPQ_DA $CONFIG_PCI
+dep_tristate 'Compaq CISS Array support' CONFIG_BLK_CPQ_CISS_DA $CONFIG_PCI 
 dep_tristate 'Mylex DAC960/DAC1100 PCI RAID Controller support' CONFIG_BLK_DEV_DAC960 $CONFIG_PCI
 
 tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP
 dep_tristate 'Network block device support' CONFIG_BLK_DEV_NBD $CONFIG_NET
 
-if [ "$CONFIG_PCI" = "y" ]; then
-  tristate 'Compaq CISS Array support' CONFIG_BLK_CPQ_CISS_DA
-fi
-
 tristate 'RAM disk support' CONFIG_BLK_DEV_RAM
 if [ "$CONFIG_BLK_DEV_RAM" = "y" -o "$CONFIG_BLK_DEV_RAM" = "m" ]; then
 	int '   Default RAM disk size' CONFIG_BLK_DEV_RAM_SIZE 4096

drivers/block/Makefile

@@ -31,7 +31,7 @@ obj-$(CONFIG_BLK_DEV_LOOP)	+= loop.o
 obj-$(CONFIG_BLK_DEV_PS2)	+= ps2esdi.o
 obj-$(CONFIG_BLK_DEV_XD)	+= xd.o
 obj-$(CONFIG_BLK_CPQ_DA)	+= cpqarray.o
-obj-$(CONFIG_BLK_CPQ_CISS_DA)	+= cciss.o
+obj-$(CONFIG_BLK_CPQ_CISS_DA)  += cciss.o
 obj-$(CONFIG_BLK_DEV_DAC960)	+= DAC960.o
 
 obj-$(CONFIG_BLK_DEV_NBD)	+= nbd.o

drivers/block/cciss.h

@@ -42,10 +42,11 @@ struct ctlr_info
 	char	devname[8];
 	char    *product_name;
 	char	firm_ver[4]; // Firmware version 
-        struct pci_dev *pci_dev;
+	unchar  pci_bus;
+        unchar  pci_dev_fn;
 	__u32	board_id;
-	void   *vaddr;
-	unsigned long paddr;	
+	ulong   vaddr;
+	__u32	paddr;	
 	CfgTable_struct *cfgtable;
 	int	intr;
 

drivers/block/ll_rw_blk.c

@@ -600,9 +600,9 @@ static inline void add_request(request_queue_t * q, struct request * req,
 	major = MAJOR(req->rq_dev);
 	if (major >= COMPAQ_SMART2_MAJOR+0 && major <= COMPAQ_SMART2_MAJOR+7)
 		(q->request_fn)(q);
-	if (major >= DAC960_MAJOR+0 && major <= DAC960_MAJOR+7)
-		(q->request_fn)(q);
 	if (major >= COMPAQ_CISS_MAJOR+0 && major <= COMPAQ_CISS_MAJOR+7)
+                (q->request_fn)(q);
+	if (major >= DAC960_MAJOR+0 && major <= DAC960_MAJOR+7)
 		(q->request_fn)(q);
 }
 

drivers/char/lp.c

@@ -712,11 +712,12 @@ static void lp_attach (struct parport *port)
 		if (parport_nr[0] == LP_PARPORT_AUTO &&
 		    port->probe_info[0].class != PARPORT_CLASS_PRINTER)
 			return;
-
+		if (lp_count == LP_NO) {
+			printk("lp: ignoring parallel port (max. %d)\n",LP_NO);
+			return;
+		}
 		if (!lp_register(lp_count, port))
-			if (++lp_count == LP_NO)
-				break;
-
+			lp_count++;
 		break;
 
 	default:

drivers/char/mem.c

@@ -28,12 +28,6 @@
 #ifdef CONFIG_I2C
 extern int i2c_init_all(void);
 #endif
-#ifdef CONFIG_SOUND
-void soundcore_init(void);
-#ifdef CONFIG_SOUND_OSS
-void soundcard_init(void);
-#endif
-#endif
 #ifdef CONFIG_SPARCAUDIO
 extern int sparcaudio_init(void);
 #endif
@@ -641,15 +635,6 @@ int __init chr_dev_init(void)
 	lp_m68k_init();
 #endif
 	misc_init();
-#ifdef CONFIG_SOUND
-	soundcore_init();
-#ifdef CONFIG_SOUND_OSS
-	soundcard_init();
-#endif
-#endif
-#ifdef CONFIG_SPARCAUDIO
-	sparcaudio_init();
-#endif
 #if CONFIG_QIC02_TAPE
 	qic02_tape_init();
 #endif

drivers/mtd/mapped.c

@@ -20,7 +20,6 @@
 #include <linux/errno.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
-#include <linux/delay.h>
 #include <asm/io.h>
 
 struct JEDECTable mtd_JEDEC_table[] = 

drivers/net/hamachi.c

@@ -150,7 +150,6 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
 /* Time in jiffies before concluding the transmitter is hung. */
 #define TX_TIMEOUT  (5*HZ)
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

drivers/net/ioc3-eth.c

@@ -64,7 +64,7 @@
 #include <asm/sn/sn0/hubni.h>
 #include <asm/sn/sn0/hubio.h>
 #include <asm/sn/klconfig.h>
-#include <asm/ioc3.h>
+#include <asm/sn/ioc3.h>
 #include <asm/sn/sn0/ip27.h>
 #include <asm/pci/bridge.h>
 

drivers/net/sundance.c

@@ -78,7 +78,6 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
 #endif
 
 /* Include files, designed to support most kernel versions 2.0.0 and later. */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>

drivers/net/winbond-840.c

@@ -97,7 +97,6 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
 #endif
 
 /* Include files, designed to support most kernel versions 2.0.0 and later. */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>

drivers/sound/Config.in

@@ -16,6 +16,7 @@ if [ "$CONFIG_SOUND_CMPCI" = "y" -o "$CONFIG_SOUND_CMPCI" = "m" ]; then
 fi
 dep_tristate '  Creative SBLive! (EMU10K1)' CONFIG_SOUND_EMU10K1 $CONFIG_SOUND
 dep_tristate '  Crystal SoundFusion (CS4280/461x)' CONFIG_SOUND_FUSION $CONFIG_SOUND
+dep_tristate '  Crystal Sound CS4281' CONFIG_SOUND_CS4281 $CONFIG_SOUND
 dep_tristate '  Ensoniq AudioPCI (ES1370)' CONFIG_SOUND_ES1370 $CONFIG_SOUND
 dep_tristate '  Creative Ensoniq AudioPCI 97 (ES1371)' CONFIG_SOUND_ES1371 $CONFIG_SOUND
 dep_tristate '  ESS Technology Solo1' CONFIG_SOUND_ESSSOLO1 $CONFIG_SOUND
@@ -127,12 +128,6 @@ if [ "$CONFIG_SOUND_OSS" = "y" -o "$CONFIG_SOUND_OSS" = "m" ]; then
       fi
    fi
 
-   dep_tristate '    SoftOSS software wave table engine' CONFIG_SOUND_SOFTOSS $CONFIG_SOUND_OSS
-   if [ "$CONFIG_SOUND_SOFTOSS" = "y" ]; then
-      int 'Sampling rate for SoftOSS 8000 to 48000' CONFIG_SOFTOSS_RATE 22050
-      int 'Max # of concurrent voices for SoftOSS 4 to 32' CONFIG_SOFTOSS_VOICES 32
-   fi
-  
    dep_tristate '    100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support' CONFIG_SOUND_SB $CONFIG_SOUND_OSS
    dep_tristate '    AWE32 synth' CONFIG_SOUND_AWE32_SYNTH $CONFIG_SOUND_OSS
    dep_tristate '    Full support for Turtle Beach WaveFront (Tropez Plus, Tropez, Maui) synth/soundcards' CONFIG_SOUND_WAVEFRONT $CONFIG_SOUND_OSS m

drivers/sound/Makefile

@@ -43,7 +43,6 @@ obj-$(CONFIG_SOUND_AEDSP16)	+= aedsp16.o
 obj-$(CONFIG_SOUND_PSS)		+= pss.o ad1848.o mpu401.o
 obj-$(CONFIG_SOUND_TRIX)	+= trix.o ad1848.o sb_lib.o uart401.o
 obj-$(CONFIG_SOUND_OPL3SA1)	+= opl3sa.o ad1848.o uart401.o
-obj-$(CONFIG_SOUND_SOFTOSS)	+= softoss2.o
 obj-$(CONFIG_SOUND_SSCAPE)	+= sscape.o ad1848.o mpu401.o
 obj-$(CONFIG_SOUND_MAD16)	+= mad16.o ad1848.o sb_lib.o uart401.o
 obj-$(CONFIG_SOUND_CS4232)	+= cs4232.o uart401.o
@@ -79,6 +78,7 @@ obj-$(CONFIG_SOUND_ES1370)	+= es1370.o
 obj-$(CONFIG_SOUND_ES1371)	+= es1371.o ac97_codec.o
 obj-$(CONFIG_SOUND_ESSSOLO1)	+= esssolo1.o
 obj-$(CONFIG_SOUND_FUSION)	+= cs46xx.o ac97_codec.o
+obj-$(CONFIG_SOUND_CS4281)	+= cs4281.o
 obj-$(CONFIG_SOUND_MAESTRO)	+= maestro.o
 obj-$(CONFIG_SOUND_TRIDENT)	+= trident.o ac97_codec.o
 
@@ -104,7 +104,7 @@ endif
 
 # Declare multi-part drivers.
 
-list-multi	:= sound.o gus.o pas2.o sb.o sb_lib.o softoss2.o vidc_mod.o \
+list-multi	:= sound.o gus.o pas2.o sb.o sb_lib.o vidc_mod.o \
     soundcore.o wavefront.o
 
 sound-objs	:= 							\
@@ -119,7 +119,6 @@ gus-objs	:= gus_card.o gus_midi.o gus_vol.o gus_wave.o ics2101.o
 pas2-objs	:= pas2_card.o pas2_midi.o pas2_mixer.o pas2_pcm.o
 sb-objs		:= sb_card.o
 sb_lib-objs	:= sb_common.o sb_audio.o sb_midi.o sb_mixer.o sb_ess.o
-softoss2-objs	:= softoss.o softoss_rs.o
 vidc_mod-objs	:= vidc.o vidc_fill.o
 wavefront-objs  := wavfront.o wf_midi.o yss225.o
 
@@ -181,9 +180,6 @@ sb.o: $(sb-objs)
 sb_lib.o: $(sb_lib-objs)
 	$(LD) -r -o $@ $(sb_lib-objs)
 
-softoss2.o: $(softoss2-objs)
-	$(LD) -r -o $@ $(softoss2-objs)
-
 vidc_mod.o: $(vidc_mod-objs)
 	$(LD) -r -o $@ $(vidc_mod-objs)
 

drivers/sound/ac97_codec.c

@@ -35,6 +35,7 @@
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/bitops.h>
+#include <linux/delay.h>
 #include <linux/ac97_codec.h>
 #include <asm/uaccess.h>
 
@@ -566,10 +567,8 @@ int ac97_probe_codec(struct ac97_codec *codec)
 	/* also according to spec, we wait for codec-ready state */	
 	if (codec->codec_wait)
 		codec->codec_wait(codec);
-	else {
-		current->state = TASK_UNINTERRUPTIBLE;
-		schedule_timeout(5);
-	}
+	else
+		udelay(10);
 
 	if ((audio = codec->codec_read(codec, AC97_RESET)) & 0x8000) {
 		printk(KERN_ERR "ac97_codec: %s ac97 codec not present\n",
@@ -588,7 +587,6 @@ int ac97_probe_codec(struct ac97_codec *codec)
 	id2 = codec->codec_read(codec, AC97_VENDOR_ID2);
 	for (i = 0; i < arraysize(ac97_codec_ids); i++) {
 		if (ac97_codec_ids[i].id == ((id1 << 16) | id2)) {
-			codec->id = ac97_codec_ids[i].id;
 			codec->name = ac97_codec_ids[i].name;
 			codec->codec_init = ac97_codec_ids[i].init;
 			break;
@@ -630,7 +628,7 @@ static int ac97_init_mixer(struct ac97_codec *codec)
 	codec->codec_write(codec, AC97_PCMOUT_VOL, 0L);
 
 	/* codec specific initialization for 4-6 channel output or secondary codec stuff */
-	if (codec->id != 0 && codec->codec_init != NULL) {
+	if (codec->codec_init != NULL) {
 		codec->codec_init(codec);
 	}
 
@@ -649,6 +647,10 @@ static int ac97_init_mixer(struct ac97_codec *codec)
 
 static int sigmatel_init(struct ac97_codec * codec)
 {
+	/* Only set up secondary codec */
+	if (codec->id == 0)
+		return 1;
+
 	codec->codec_write(codec, AC97_SURROUND_MASTER, 0L);
 
 	/* initialize SigmaTel STAC9721/23 as secondary codec, decoding AC link

drivers/sound/cmpci.c

@@ -2287,8 +2287,6 @@ static int	rear_out = 0;
 MODULE_PARM(spdif_loop, "i");
 MODULE_PARM(four_ch, "i");
 MODULE_PARM(rear_out, "i");
-
-int  __init init_module(void)
 #else
 #ifdef CONFIG_SOUND_CMPCI_SPDIFLOOP
 static int	spdif_loop = 1;
@@ -2305,9 +2303,9 @@ static int	rear_out = 1;
 #else
 static int	rear_out = 0;
 #endif
-
-int __init init_cmpci(void)
 #endif
+
+static int __init init_cmpci(void)
 {
 	struct cm_state *s;
 	struct pci_dev *pcidev = NULL;
@@ -2499,12 +2497,10 @@ int __init init_cmpci(void)
 
 /* --------------------------------------------------------------------- */
 
-#ifdef MODULE
-
 MODULE_AUTHOR("ChenLi Tien, cltien@home.com");
 MODULE_DESCRIPTION("CMPCI Audio Driver");
 
-void cleanup_module(void)
+static void __exit cleanup_cmpci(void)
 {
 	struct cm_state *s;
 
@@ -2538,4 +2534,5 @@ void cleanup_module(void)
 	printk(KERN_INFO "cmpci: unloading\n");
 }
 
-#endif /* MODULE */
+module_init(init_cmpci);
+module_exit(cleanup_cmpci);

drivers/sound/dev_table.c

@@ -16,8 +16,6 @@
 #define _DEV_TABLE_C_
 #include "sound_config.h"
 
-int softoss_dev = 0;
-
 int sound_install_audiodrv(int vers, char *name, struct audio_driver *driver,
 			int driver_size, int flags, unsigned int format_mask,
 			void *devc, int dma1, int dma2)

drivers/sound/sequencer_syms.c

@@ -23,10 +23,6 @@ EXPORT_SYMBOL(sound_timer_interrupt);
 EXPORT_SYMBOL(sound_timer_syncinterval);
 EXPORT_SYMBOL(reprogram_timer);
 
-#include "softoss.h"
-
-EXPORT_SYMBOL(softsynthp);
-
 /* Tuning */
 
 #define _SEQUENCER_C_

drivers/sound/sound_syms.c

@@ -49,8 +49,5 @@ EXPORT_SYMBOL(load_mixer_volumes);
 EXPORT_SYMBOL(conf_printf);
 EXPORT_SYMBOL(conf_printf2);
 
-extern int softoss_dev;
-EXPORT_SYMBOL(softoss_dev);
-
 MODULE_DESCRIPTION("OSS Sound subsystem");
 MODULE_AUTHOR("Hannu Savolainen, et al.");

drivers/usb/devices.c

@@ -496,8 +496,10 @@ static unsigned int usb_device_poll(struct file *file, struct poll_table_struct
 	lock_kernel();
 	if (!st) {
 		st = kmalloc(sizeof(struct usb_device_status), GFP_KERNEL);
-		if (!st)
+		if (!st) {
+			unlock_kernel();
 			return POLLIN;
+		}
 		/*
 		 * need to prevent the module from being unloaded, since
 		 * proc_unregister does not call the release method and