Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

uml: fix build

Fix a build error introduced by d6d1b650ae6acce73d55dd024 ("param: simple
locking for sysfs-writable charp parameters").

CC arch/um/kernel/trap.o
arch/um/drivers/hostaudio_kern.c: In function 'hostaudio_open':
arch/um/drivers/hostaudio_kern.c:204: error: '__param_dsp' undeclared (first use in this function)
arch/um/drivers/hostaudio_kern.c:204: error: (Each undeclared identifier is reported only once
arch/um/drivers/hostaudio_kern.c:204: error: for each function it appears in.)
arch/um/drivers/hostaudio_kern.c: In function 'hostmixer_open_mixdev':
arch/um/drivers/hostaudio_kern.c:265: error: '__param_mixer' undeclared (first use in this function)
arch/um/drivers/hostaudio_kern.c:272: error: '__param_dsp' undeclared (first use in this function)

Reported-by: Toralf Förster <toralf.foerster@gmx.de>
Tested-by: Toralf Förster <toralf.foerster@gmx.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

FUJITA Tomonori and committed by
Linus Torvalds
e3c6cf61 a9febbb4

+5 -9
+5 -9
arch/um/drivers/hostaudio_kern.c
··· 40 40 " This is used to specify the host mixer device to the hostaudio driver.\n"\ 41 41 " The default is \"" HOSTAUDIO_DEV_MIXER "\".\n\n" 42 42 43 + module_param(dsp, charp, 0644); 44 + MODULE_PARM_DESC(dsp, DSP_HELP); 45 + module_param(mixer, charp, 0644); 46 + MODULE_PARM_DESC(mixer, MIXER_HELP); 47 + 43 48 #ifndef MODULE 44 49 static int set_dsp(char *name, int *add) 45 50 { ··· 61 56 } 62 57 63 58 __uml_setup("mixer=", set_mixer, "mixer=<mixer device>\n" MIXER_HELP); 64 - 65 - #else /*MODULE*/ 66 - 67 - module_param(dsp, charp, 0644); 68 - MODULE_PARM_DESC(dsp, DSP_HELP); 69 - 70 - module_param(mixer, charp, 0644); 71 - MODULE_PARM_DESC(mixer, MIXER_HELP); 72 - 73 59 #endif 74 60 75 61 /* /dev/dsp file operations */