Skip to contentSkip to conversation

CVS: kcalloc change missing symbols on 2.4.27rc2

PATCH Mark Cooke 1 participant 1 message Jun 30, 2004

lore
Share & tools
lore

Mark Cooke

author
#0 lore raw

Hi all,

Synced up to CVS this morning, and after building successfully:

/lib/modules/2.4.26-27rc2.nt.mc1/kernel/sound/acore/snd.o: unresolved symbol snd_compat_kcalloc_Rc0712957 /lib/modules/2.4.26-27rc2.nt.mc1/kernel/sound/acore/snd.o: insmod /lib/modules/2.4.26-27rc2.nt.mc1/kernel/sound/acore/snd.o failed /lib/modules/2.4.26-27rc2.nt.mc1/kernel/sound/acore/snd.o: insmod sound-slot-0 failed

Both CONFIG_SND_DEBUG_MEMORY and CONFIG_HAVE_KCALLOC are not defined for my compile.

I believe misc.c has incorrect #ifdef protection for defining snd_compat_kcalloc:

Quoted 1 line

From adriver.h:

/* kcalloc */
#ifndef CONFIG_HAVE_KCALLOC
#ifndef CONFIG_SND_DEBUG_MEMORY
void *snd_compat_kcalloc(size_t n, size_t size, int gfp_flags); #define kcalloc(n,s,f) snd_compat_kcalloc(n,s,f) #endif
#endif

Quoted 1 line

From misc.c:

#ifndef CONFIG_HAVE_KCALLOC
#ifdef CONFIG_SND_DEBUG_MEMORY
/* Don't put this to wrappers.c. We need to call the kmalloc wrapper here. */void *snd_compat_kcalloc(size_t n, size_t size, int flags) {
}
#endif
#endif

Mark

Signature · 1 line
Mark Cooke <[email protected]>

Index: acore/misc.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/misc.c,v retrieving revision 1.24

misc.c +1 -1
diff -u -r1.24 misc.c
@@ -239,7 +239,7 @@
 #endif
 
 #ifndef CONFIG_HAVE_KCALLOC
-#ifdef CONFIG_SND_DEBUG_MEMORY
+#ifndef CONFIG_SND_DEBUG_MEMORY
 /* Don't put this to wrappers.c.  We need to call the kmalloc wrapper here. */
 void *snd_compat_kcalloc(size_t n, size_t size, int flags)
 {