Re: dma-mapping commit breaks UML

Re: dma-mapping commit breaks UML

[Toralf Förster]

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

Re: dma-mapping commit breaks UML

[FUJITA Tomonori]

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 */

Re: dma-mapping commit breaks UML

[Toralf Förster]

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