* dma-mapping commit breaks UML
@ 2010-09-29 9:55 Toralf Förster
2010-09-29 13:20 ` FUJITA Tomonori
0 siblings, 1 reply; 6+ messages in thread
From: Toralf Förster @ 2010-09-29 9:55 UTC (permalink / raw)
To: fujita.tomonori; +Cc: linux-arch
The
4565f0170dfc849b3629c27d769db800467baa62 is the first bad commit
commit 4565f0170dfc849b3629c27d769db800467baa62
Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue Aug 10 18:03:22 2010 -0700
dma-mapping: unify dma_get_cache_alignment implementations
It produces this compile error for ARCH=um :
...
CC init/do_mounts.o
In file included from include/linux/dmaengine.h:27,
from include/linux/skbuff.h:31,
from include/linux/icmpv6.h:83,
from include/linux/ipv6.h:221,
from include/net/ipv6.h:17,
from include/linux/sunrpc/clnt.h:26,
from include/linux/nfs_fs.h:49,
from init/do_mounts.c:21:
include/linux/dma-mapping.h:145: error: redefinition of
‘dma_get_cache_alignment’
/home/tfoerste/devel/linux-2.6/arch/um/include/asm/dma-mapping.h:100: note:
previous definition of ‘dma_get_cache_alignment’ was here
make[1]: *** [init/do_mounts.o] Error 1
make: *** [init] Error 2
--
MfG/Kind regards
Toralf Förster
pgp finger print: 7B1A 07F4 EC82 0F90 D4C2 8936 872A E508 7DB6 9DA3
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: dma-mapping commit breaks UML 2010-09-29 9:55 dma-mapping commit breaks UML Toralf Förster @ 2010-09-29 13:20 ` FUJITA Tomonori 2010-09-29 14:29 ` Toralf Förster 0 siblings, 1 reply; 6+ messages in thread From: FUJITA Tomonori @ 2010-09-29 13:20 UTC (permalink / raw) To: toralf.foerster; +Cc: fujita.tomonori, linux-arch On Wed, 29 Sep 2010 11:55:30 +0200 Toralf **UNKNOWN CHARSET** <toralf.foerster@gmx.de> wrote: > The > > 4565f0170dfc849b3629c27d769db800467baa62 is the first bad commit > commit 4565f0170dfc849b3629c27d769db800467baa62 > Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> > Date: Tue Aug 10 18:03:22 2010 -0700 > > dma-mapping: unify dma_get_cache_alignment implementations I think that the commit f3c072ad727617f00bffae17dba8cd895f5b7bdb already fixed this breakage. You still have the issue with the latest git? ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: dma-mapping commit breaks UML 2010-09-29 13:20 ` FUJITA Tomonori @ 2010-09-29 14:29 ` Toralf Förster 2010-09-30 5:45 ` FUJITA Tomonori 0 siblings, 1 reply; 6+ messages in thread From: Toralf Förster @ 2010-09-29 14:29 UTC (permalink / raw) To: FUJITA Tomonori; +Cc: linux-arch, linux-kernel FUJITA Tomonori wrote at 15:20:38 > On Wed, 29 Sep 2010 11:55:30 +0200 > > Toralf **UNKNOWN CHARSET** <toralf.foerster@gmx.de> wrote: > > The > > > > 4565f0170dfc849b3629c27d769db800467baa62 is the first bad commit > > commit 4565f0170dfc849b3629c27d769db800467baa62 > > Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> > > Date: Tue Aug 10 18:03:22 2010 -0700 > > > > dma-mapping: unify dma_get_cache_alignment implementations > > I think that the commit f3c072ad727617f00bffae17dba8cd895f5b7bdb > already fixed this breakage. You still have the issue with the latest > git? Argh, I use a script for git-bisect to catch this compile error in the current git kernel v2.6.36-rc6-20-g8189b14 : ... 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) make[1]: *** [arch/um/drivers/hostaudio_kern.o] Error 1 make: *** [arch/um/drivers] Error 2 make: *** Waiting for unfinished jobs.... ... but catched another compile error - how can I now automatically git-bisect for that wrong commit w/o heavy scripting ? - Or simply asking who to blame wrt this compile error ? -- MfG/Kind regards Toralf Förster pgp finger print: 7B1A 07F4 EC82 0F90 D4C2 8936 872A E508 7DB6 9DA3 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: dma-mapping commit breaks UML 2010-09-29 14:29 ` Toralf Förster @ 2010-09-30 5:45 ` FUJITA Tomonori 2010-09-30 8:34 ` Toralf Förster 0 siblings, 1 reply; 6+ messages in thread From: FUJITA Tomonori @ 2010-09-30 5:45 UTC (permalink / raw) To: toralf.foerster; +Cc: fujita.tomonori, linux-arch, linux-kernel On Wed, 29 Sep 2010 16:29:38 +0200 Toralf **UNKNOWN CHARSET** <toralf.foerster@gmx.de> wrote: > but catched another compile error - how can I now automatically > git-bisect for that wrong commit w/o heavy scripting ? - Or simply > asking who to blame wrt this compile error ? Fortunately, looks like we can easily figure out the root cause of this (commit d6d1b650ae6acce73d55dd0246de22180303ae73), the last commit to arch/um/drivers/hostaudio_kern.c The following patch works? diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c index 0c46e39..63c740a 100644 --- a/arch/um/drivers/hostaudio_kern.c +++ b/arch/um/drivers/hostaudio_kern.c @@ -40,6 +40,11 @@ static char *mixer = HOSTAUDIO_DEV_MIXER; " This is used to specify the host mixer device to the hostaudio driver.\n"\ " The default is \"" HOSTAUDIO_DEV_MIXER "\".\n\n" +module_param(dsp, charp, 0644); +MODULE_PARM_DESC(dsp, DSP_HELP); +module_param(mixer, charp, 0644); +MODULE_PARM_DESC(mixer, MIXER_HELP); + #ifndef MODULE static int set_dsp(char *name, int *add) { @@ -56,15 +61,6 @@ static int set_mixer(char *name, int *add) } __uml_setup("mixer=", set_mixer, "mixer=<mixer device>\n" MIXER_HELP); - -#else /*MODULE*/ - -module_param(dsp, charp, 0644); -MODULE_PARM_DESC(dsp, DSP_HELP); - -module_param(mixer, charp, 0644); -MODULE_PARM_DESC(mixer, MIXER_HELP); - #endif /* /dev/dsp file operations */ ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: dma-mapping commit breaks UML 2010-09-30 5:45 ` FUJITA Tomonori @ 2010-09-30 8:34 ` Toralf Förster 2010-09-30 8:34 ` Toralf Förster 0 siblings, 1 reply; 6+ messages in thread From: Toralf Förster @ 2010-09-30 8:34 UTC (permalink / raw) To: FUJITA Tomonori; +Cc: linux-arch, linux-kernel FUJITA Tomonori wrote at 07:45:19 > On Wed, 29 Sep 2010 16:29:38 +0200 > > Toralf **UNKNOWN CHARSET** <toralf.foerster@gmx.de> wrote: > > but catched another compile error - how can I now automatically > > git-bisect for that wrong commit w/o heavy scripting ? - Or simply > > asking who to blame wrt this compile error ? > > Fortunately, looks like we can easily figure out the root cause of > this (commit d6d1b650ae6acce73d55dd0246de22180303ae73), the last > commit to arch/um/drivers/hostaudio_kern.c > > The following patch works? YES :-) > diff --git a/arch/um/drivers/hostaudio_kern.c > b/arch/um/drivers/hostaudio_kern.c index 0c46e39..63c740a 100644 > --- a/arch/um/drivers/hostaudio_kern.c > +++ b/arch/um/drivers/hostaudio_kern.c > @@ -40,6 +40,11 @@ static char *mixer = HOSTAUDIO_DEV_MIXER; > " This is used to specify the host mixer device to the hostaudio > driver.\n"\ " The default is \"" HOSTAUDIO_DEV_MIXER "\".\n\n" > > +module_param(dsp, charp, 0644); > +MODULE_PARM_DESC(dsp, DSP_HELP); > +module_param(mixer, charp, 0644); > +MODULE_PARM_DESC(mixer, MIXER_HELP); > + > #ifndef MODULE > static int set_dsp(char *name, int *add) > { > @@ -56,15 +61,6 @@ static int set_mixer(char *name, int *add) > } > > __uml_setup("mixer=", set_mixer, "mixer=<mixer device>\n" MIXER_HELP); > - > -#else /*MODULE*/ > - > -module_param(dsp, charp, 0644); > -MODULE_PARM_DESC(dsp, DSP_HELP); > - > -module_param(mixer, charp, 0644); > -MODULE_PARM_DESC(mixer, MIXER_HELP); > - > #endif > > /* /dev/dsp file operations */ -- MfG/Kind regards Toralf Förster pgp finger print: 7B1A 07F4 EC82 0F90 D4C2 8936 872A E508 7DB6 9DA3 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: dma-mapping commit breaks UML 2010-09-30 8:34 ` Toralf Förster @ 2010-09-30 8:34 ` Toralf Förster 0 siblings, 0 replies; 6+ messages in thread From: Toralf Förster @ 2010-09-30 8:34 UTC (permalink / raw) To: FUJITA Tomonori; +Cc: linux-arch, linux-kernel FUJITA Tomonori wrote at 07:45:19 > On Wed, 29 Sep 2010 16:29:38 +0200 > > Toralf **UNKNOWN CHARSET** <toralf.foerster@gmx.de> wrote: > > but catched another compile error - how can I now automatically > > git-bisect for that wrong commit w/o heavy scripting ? - Or simply > > asking who to blame wrt this compile error ? > > Fortunately, looks like we can easily figure out the root cause of > this (commit d6d1b650ae6acce73d55dd0246de22180303ae73), the last > commit to arch/um/drivers/hostaudio_kern.c > > The following patch works? YES :-) > diff --git a/arch/um/drivers/hostaudio_kern.c > b/arch/um/drivers/hostaudio_kern.c index 0c46e39..63c740a 100644 > --- a/arch/um/drivers/hostaudio_kern.c > +++ b/arch/um/drivers/hostaudio_kern.c > @@ -40,6 +40,11 @@ static char *mixer = HOSTAUDIO_DEV_MIXER; > " This is used to specify the host mixer device to the hostaudio > driver.\n"\ " The default is \"" HOSTAUDIO_DEV_MIXER "\".\n\n" > > +module_param(dsp, charp, 0644); > +MODULE_PARM_DESC(dsp, DSP_HELP); > +module_param(mixer, charp, 0644); > +MODULE_PARM_DESC(mixer, MIXER_HELP); > + > #ifndef MODULE > static int set_dsp(char *name, int *add) > { > @@ -56,15 +61,6 @@ static int set_mixer(char *name, int *add) > } > > __uml_setup("mixer=", set_mixer, "mixer=<mixer device>\n" MIXER_HELP); > - > -#else /*MODULE*/ > - > -module_param(dsp, charp, 0644); > -MODULE_PARM_DESC(dsp, DSP_HELP); > - > -module_param(mixer, charp, 0644); > -MODULE_PARM_DESC(mixer, MIXER_HELP); > - > #endif > > /* /dev/dsp file operations */ -- MfG/Kind regards Toralf Förster pgp finger print: 7B1A 07F4 EC82 0F90 D4C2 8936 872A E508 7DB6 9DA3 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-09-30 8:34 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-09-29 9:55 dma-mapping commit breaks UML Toralf Förster 2010-09-29 13:20 ` FUJITA Tomonori 2010-09-29 14:29 ` Toralf Förster 2010-09-30 5:45 ` FUJITA Tomonori 2010-09-30 8:34 ` Toralf Förster 2010-09-30 8:34 ` Toralf Förster
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox