Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 Nov 2002 13:13:18 +0100
From:      Mark Santcroos <marks@ripe.net>
To:        Jan Stocker <jstocker@tzi.de>
Cc:        current@FreeBSD.ORG
Subject:   Re: Kernel broken
Message-ID:  <20021126121317.GA22627@laptop.6bone.nl>
In-Reply-To: <000001c29542$7573d1e0$fe02010a@twoflower.liebende.de>
References:  <000001c29542$7573d1e0$fe02010a@twoflower.liebende.de>

Next in thread | Previous in thread | Raw E-Mail | Index | Archive | Help
Changing the locks from "void *" to "struct mtx *" seems to fix the problem.

Mark

diff -u -r ../../../../vendor/sys/dev/sound/isa/ad1816.c ./isa/ad1816.c
--- ../../../../vendor/sys/dev/sound/isa/ad1816.c	Thu Nov 14 17:00:39 2002
+++ ./isa/ad1816.c	Tue Nov 26 13:03:17 2002
@@ -53,7 +53,7 @@
 	int drq2_rid;
 	void *ih;
 	bus_dma_tag_t parent_dmat;
-	void *lock;
+	struct mtx *lock;
 
 	unsigned int bufsize;
 	struct ad1816_chinfo pch, rch;
diff -u -r ../../../../vendor/sys/dev/sound/isa/mss.c ./isa/mss.c
--- ../../../../vendor/sys/dev/sound/isa/mss.c	Thu Nov 14 17:00:39 2002
+++ ./isa/mss.c	Tue Nov 26 13:05:48 2002
@@ -66,7 +66,7 @@
     int		     drq2_rid;
     void 	    *ih;
     bus_dma_tag_t    parent_dmat;
-    void	    *lock;
+    struct mtx	*lock;
 
     char mss_indexed_regs[MSS_INDEXED_REGS];
     char opl_indexed_regs[OPL_INDEXED_REGS];
diff -u -r ../../../../vendor/sys/dev/sound/isa/sbc.c ./isa/sbc.c
--- ../../../../vendor/sys/dev/sound/isa/sbc.c	Thu Nov 14 17:00:39 2002
+++ ./isa/sbc.c	Tue Nov 26 13:06:04 2002
@@ -64,7 +64,7 @@
 
 	void *ih[IRQ_MAX];
 
-	void *lock;
+	struct mtx *lock;
 
 	u_int32_t bd_ver;
 };
diff -u -r ../../../../vendor/sys/dev/sound/pci/cmi.c ./pci/cmi.c
--- ../../../../vendor/sys/dev/sound/pci/cmi.c	Thu Nov 14 17:00:39 2002
+++ ./pci/cmi.c	Tue Nov 26 13:06:19 2002
@@ -107,7 +107,7 @@
 	struct resource		*reg, *irq;
 	int			regid, irqid;
 	void 			*ih;
-	void			*lock;
+	struct mtx			*lock;
 
 	int			spdif_enabled;
 	unsigned int		bufsz;
diff -u -r ../../../../vendor/sys/dev/sound/pci/ds1.c ./pci/ds1.c
--- ../../../../vendor/sys/dev/sound/pci/ds1.c	Thu Nov 14 17:00:40 2002
+++ ./pci/ds1.c	Tue Nov 26 13:06:36 2002
@@ -116,7 +116,7 @@
 	struct resource *reg, *irq;
 	int		regid, irqid;
 	void		*ih;
-	void		*lock;
+	struct mtx *lock;
 
 	void *regbase;
 	u_int32_t *pbase, pbankbase, pbanksize;
diff -u -r ../../../../vendor/sys/dev/sound/pci/emu10k1.c ./pci/emu10k1.c
--- ../../../../vendor/sys/dev/sound/pci/emu10k1.c	Tue Nov 26 09:20:58 2002
+++ ./pci/emu10k1.c	Tue Nov 26 13:06:49 2002
@@ -96,7 +96,7 @@
 
 	struct resource *reg, *irq;
 	void		*ih;
-	void		*lock;
+	struct mtx *lock;
 
 	unsigned int bufsz;
 	int timer, timerinterval;
diff -u -r ../../../../vendor/sys/dev/sound/pci/t4dwave.c ./pci/t4dwave.c
--- ../../../../vendor/sys/dev/sound/pci/t4dwave.c	Thu Nov 14 17:00:40 2002
+++ ./pci/t4dwave.c	Tue Nov 26 13:07:10 2002
@@ -81,7 +81,7 @@
 	int regtype, regid, irqid;
 	void *ih;
 
-	void *lock;
+	struct mtx *lock;
 
 	u_int32_t playchns;
 	unsigned int bufsz;
diff -u -r ../../../../vendor/sys/dev/sound/pcm/ac97.c ./pcm/ac97.c
--- ../../../../vendor/sys/dev/sound/pcm/ac97.c	Thu Nov 14 17:00:40 2002
+++ ./pcm/ac97.c	Tue Nov 26 13:07:27 2002
@@ -55,7 +55,7 @@
 	u_int32_t flags;
 	struct ac97mixtable_entry mix[32];
 	char name[AC97_NAMELEN];
-	void *lock;
+	struct mtx *lock;
 };
 
 struct ac97_codecid {
diff -u -r ../../../../vendor/sys/dev/sound/pcm/mixer.c ./pcm/mixer.c
--- ../../../../vendor/sys/dev/sound/pcm/mixer.c	Thu Nov 14 17:00:40 2002
+++ ./pcm/mixer.c	Tue Nov 26 13:07:52 2002
@@ -47,7 +47,7 @@
 	u_int32_t recsrc;
 	u_int16_t level[32];
 	char name[MIXER_NAMELEN];
-	void *lock;
+	struct mtx *lock;
 };
 
 static u_int16_t snd_mixerdefaults[SOUND_MIXER_NRDEVICES] = {
diff -u -r ../../../../vendor/sys/dev/sound/pcm/sound.c ./pcm/sound.c
--- ../../../../vendor/sys/dev/sound/pcm/sound.c	Tue Nov 26 09:20:59 2002
+++ ./pcm/sound.c	Tue Nov 26 13:08:08 2002
@@ -50,7 +50,7 @@
 	char status[SND_STATUSLEN];
 	struct sysctl_ctx_list sysctl_tree;
 	struct sysctl_oid *sysctl_tree_top;
-	void *lock;
+	struct mtx *lock;
 };
 
 devclass_t pcm_devclass;
On Tue, Nov 26, 2002 at 12:53:39PM +0100, Jan Stocker wrote:
> CVSuped (2 mins ago) -current kernel is broken:
> 
> cc1: warnings being treated as errors
> /usr/src/sys/dev/sound/isa/ad1816.c: In function `ad1816_lock':
> /usr/src/sys/dev/sound/isa/ad1816.c:81: warning: dereferencing `void *'
> pointer
> /usr/src/sys/dev/sound/isa/ad1816.c:81: request for member `mtx_lock' in
> something not a structure or union
> /usr/src/sys/dev/sound/isa/ad1816.c: In function `ad1816_unlock':
> /usr/src/sys/dev/sound/isa/ad1816.c:87: warning: dereferencing `void *'
> pointer
> /usr/src/sys/dev/sound/isa/ad1816.c:87: request for member `mtx_lock' in
> something not a structure or union
> 
> Jan
> 
> 
> 
> 
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-current" in the body of the message

-- 
Mark Santcroos                    RIPE Network Coordination Centre
http://www.ripe.net/home/mark/    New Projects Group/TTM

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message




Want to link to this message? Use this URL: <http://docs.FreeBSD.org/cgi/mid.cgi?20021126121317.GA22627>