CVS: kcalloc change missing symbols on 2.4.27rc2

[Mark Cooke <mpc@star.sr.bham.ac.uk>]

[-- Attachment #1: Type: text/plain, Size: 1063 bytes --]

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:

>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

>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

-- 
Mark Cooke <mpc@star.sr.bham.ac.uk>

[-- Attachment #2: kc.diff --]
[-- Type: text/x-patch, Size: 546 bytes --]

Index: acore/misc.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/acore/misc.c,v
retrieving revision 1.24
diff -u -r1.24 misc.c
--- acore/misc.c	29 Jun 2004 15:58:54 -0000	1.24
+++ acore/misc.c	30 Jun 2004 09:36:15 -0000
@@ -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)
 {