aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-10-10 05:59:52 -0400
committerJaroslav Kysela <perex@suse.cz>2005-11-04 07:18:08 -0500
commite38e0cfa48ac38f4fe24453d2523852467c95b21 (patch)
tree6b949db59b0c73cc3d3bc04f52d479bd605c658e /include
parentb1d5776d865951c213a1caaab5d8bf5de7615dbd (diff)
[ALSA] Remove kmalloc wrappers
Modules: ALSA Core Remove kmalloc wrappers. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include')
-rw-r--r--include/sound/core.h25
-rw-r--r--include/sound/driver.h13
2 files changed, 0 insertions, 38 deletions
diff --git a/include/sound/core.h b/include/sound/core.h
index 0a14885fb1d..ed56a356ab7 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -284,31 +284,6 @@ int snd_oss_init_module(void);
284 284
285/* memory.c */ 285/* memory.c */
286 286
287#ifdef CONFIG_SND_DEBUG_MEMORY
288void snd_memory_init(void);
289void snd_memory_done(void);
290int snd_memory_info_init(void);
291int snd_memory_info_done(void);
292void *snd_hidden_kmalloc(size_t size, gfp_t flags);
293void *snd_hidden_kzalloc(size_t size, gfp_t flags);
294void *snd_hidden_kcalloc(size_t n, size_t size, gfp_t flags);
295void snd_hidden_kfree(const void *obj);
296char *snd_hidden_kstrdup(const char *s, gfp_t flags);
297#define kmalloc(size, flags) snd_hidden_kmalloc(size, flags)
298#define kzalloc(size, flags) snd_hidden_kzalloc(size, flags)
299#define kcalloc(n, size, flags) snd_hidden_kcalloc(n, size, flags)
300#define kfree(obj) snd_hidden_kfree(obj)
301#define kmalloc_nocheck(size, flags) snd_wrapper_kmalloc(size, flags)
302#define kfree_nocheck(obj) snd_wrapper_kfree(obj)
303#define kstrdup(s, flags) snd_hidden_kstrdup(s, flags)
304#else
305#define snd_memory_init() /*NOP*/
306#define snd_memory_done() /*NOP*/
307#define snd_memory_info_init() /*NOP*/
308#define snd_memory_info_done() /*NOP*/
309#define kmalloc_nocheck(size, flags) kmalloc(size, flags)
310#define kfree_nocheck(obj) kfree(obj)
311#endif
312int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size_t count); 287int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size_t count);
313int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size_t count); 288int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size_t count);
314 289
diff --git a/include/sound/driver.h b/include/sound/driver.h
index 7973e0c05ae..3f0416ac24d 100644
--- a/include/sound/driver.h
+++ b/include/sound/driver.h
@@ -44,17 +44,4 @@
44 44
45#include <linux/module.h> 45#include <linux/module.h>
46 46
47/*
48 * ==========================================================================
49 */
50
51#ifdef CONFIG_SND_DEBUG_MEMORY
52#include <linux/slab.h>
53#include <linux/vmalloc.h>
54void *snd_wrapper_kmalloc(size_t, gfp_t);
55#undef kmalloc
56void snd_wrapper_kfree(const void *);
57#undef kfree
58#endif
59
60#endif /* __SOUND_DRIVER_H */ 47#endif /* __SOUND_DRIVER_H */