sound/core/memalloc.c: fix PROC_FS=n compilation
PATCH 1/1 sound/core/memalloc.c: fix PROC_FS=n compilation
This patch fixes the following compile error with CONFIG_PROC_FS=n:
<-- snip -->
...
CC sound/core/memalloc.osound/core/memalloc.c: In function 'snd_mem_exit':sound/core/memalloc.c:658: error: 'snd_mem_proc' undeclared (first use in this function) sound/core/memalloc.c:658: error: (Each undeclared identifier is reported only once sound/core/memalloc.c:658: error: for each function it appears in.) make[2]: *** [sound/core/memalloc.o] Error 1
<-- snip -->
sound/core/memalloc.c renamed from sound/core/memalloc.c.old +1 -1
@@ -506,13 +506,13 @@up (&list_mutex); } +static struct proc_dir_entry *snd_mem_proc;#ifdef CONFIG_PROC_FS /* * proc file interface */ #define SND_MEM_PROC_FILE "driver/snd-page-alloc" -static struct proc_dir_entry *snd_mem_proc;static int snd_mem_proc_read (char *page,char **start,off_t off,int count,int *eof,void *data)
At Sat, 20 Aug 2005 21:02:58 +0200,
Quoted 27 lines · Adrian Bunk
This patch fixes the following compile error with
CONFIG_PROC_FS=n:<-- snip -->
...
CCsound/core/memalloc.osound/core/memalloc.c: In function 'snd_mem_exit':sound/core/memalloc.c:658: error: 'snd_mem_proc' undeclared (first use in this function)sound/core/memalloc.c:658: error: (Each undeclared identifier is reported only oncesound/core/memalloc.c:658: error: for each function it appears in.) make[2]: *** [sound/core/memalloc.o] Error 1<-- snip -->
Signed-off-by Adrian Bunk <[email protected]>sound/core/memalloc.c renamed from sound/core/memalloc.c.old +1
-0@@ -506,13 +506,13 @@up (&list_mutex); } +static struct proc_dir_entry *snd_mem_proc;
sound/core/memalloc.c line 518
Quoted 10 lines
sound/core/memalloc.c renamed from sound/core/memalloc.c.old +0
-1#ifdef CONFIG_PROC_FS /* * proc file interface */ #define SND_MEM_PROC_FILE "driver/snd-page-alloc" -static struct proc_dir_entry *snd_mem_proc;static int snd_mem_proc_read (char *page,char **start,off_t off,int count,int *eof,void *data)
I think the below is simpler.
Takashi
sound/core/memalloc.c +1 -2
@@ -655,8 +655,7 @@ static void __exit snd_mem_exit(void) { -if (snd_mem_proc) -remove_proc_entry (SND_MEM_PROC_FILE ,NULL ); +remove_proc_entry (SND_MEM_PROC_FILE ,NULL );free_all_reserved_pages ();if (snd_allocated_pages >0 )printk (KERN_ERR "snd-malloc: Memory leak? pages not freed = %li\n" , snd_allocated_pages);
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
Quoted 2 lines · Takashi Iwai
...
I think the below is simpler.
Looks good.
Quoted 2 lines
Takashi
...
cu
Adrian
Signature · 12 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sfQuoted 2 lines · Takashi Iwai
...
I think the below is simpler.
Looks good.
Quoted 2 lines
Takashi
...
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedAt Tue, 23 Aug 2005 03:24:25 +0200,
Quoted 6 lines · Adrian Bunk
Quoted 2 lines · Takashi Iwai
...
I think the below is simpler.Looks good.
OK, it's now on ALSA tree.
Thanks.
Takashi
At Tue, 23 Aug 2005 03:24:25 +0200,
Quoted 6 lines · Adrian Bunk
Quoted 2 lines · Takashi Iwai
...
I think the below is simpler.Looks good.
OK, it's now on ALSA tree.
Thanks.
Takashi
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf