Patchwork tip: origin tree build failure, [patch] fix isdn/gigaset build failure

login
register
mail settings
Submitter Linus Torvalds
Date April 19, 2010, 6:14 p.m.
Message ID <alpine.LFD.2.00.1004191112550.14500@i5.linux-foundation.org>
Download mbox | patch
Permalink /patch/50486/
State Accepted
Delegated to: David Miller
Headers show

Comments

Linus Torvalds - April 19, 2010, 6:14 p.m.
On Mon, 19 Apr 2010, Ingo Molnar wrote:
> 
> Note, i just found that my patch is not enough as we fail the build elsewhere as well:

Maybe add the #include <linux/sched.h> into gigaset.h, instead of 
common.c?

IOW..

		Linus
---
 drivers/isdn/gigaset/gigaset.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Linus Torvalds - April 19, 2010, 7 p.m.
On Mon, 19 Apr 2010, Linus Torvalds wrote:
> 
> Maybe add the #include <linux/sched.h> into gigaset.h, instead of 
> common.c?

This compiled for me, although the only thing I tried was just turning all 
the gigaset options to 'y'. Maybe some other config doesn't work. So I 
committed it as likely to fix things.

		Linus
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - April 19, 2010, 7:06 p.m.
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 19 Apr 2010 12:00:49 -0700 (PDT)

> On Mon, 19 Apr 2010, Linus Torvalds wrote:
>> 
>> Maybe add the #include <linux/sched.h> into gigaset.h, instead of 
>> common.c?
> 
> This compiled for me, although the only thing I tried was just turning all 
> the gigaset options to 'y'. Maybe some other config doesn't work. So I 
> committed it as likely to fix things.

Thanks Linus.

Ingo, let us know if there is still some problems in your
build tests.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ingo Molnar - April 19, 2010, 7:54 p.m.
* Linus Torvalds <torvalds@linux-foundation.org> wrote:

> On Mon, 19 Apr 2010, Linus Torvalds wrote:
> > 
> > Maybe add the #include <linux/sched.h> into gigaset.h, instead of 
> > common.c?
> 
> This compiled for me, although the only thing I tried was just turning all 
> the gigaset options to 'y'. Maybe some other config doesn't work. So I 
> committed it as likely to fix things.

I'll check it tomorrow - but i'd expect it to be enough, plus the all-yes 
thing is that matters most in practice in any case.

Thanks,

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ingo Molnar - April 19, 2010, 9:01 p.m.
* David Miller <davem@davemloft.net> wrote:

> From: Linus Torvalds <torvalds@linux-foundation.org>
> Date: Mon, 19 Apr 2010 12:00:49 -0700 (PDT)
> 
> > On Mon, 19 Apr 2010, Linus Torvalds wrote:
> >> 
> >> Maybe add the #include <linux/sched.h> into gigaset.h, instead of 
> >> common.c?
> > 
> > This compiled for me, although the only thing I tried was just turning all 
> > the gigaset options to 'y'. Maybe some other config doesn't work. So I 
> > committed it as likely to fix things.
> 
> Thanks Linus.
> 
> Ingo, let us know if there is still some problems in your
> build tests.

I did a few tests and it looks good here!

Thanks,

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tilman Schmidt - April 19, 2010, 9:52 p.m.
Am 19.04.2010 20:14 schrieb Linus Torvalds:
> Maybe add the #include <linux/sched.h> into gigaset.h, instead of 
> common.c?

Yes, that's the correct fix. Thanks a lot!

For the record, the cause of the build failure was my removal of
#include <linux/usb.h> from gigaset.h, entailing the loss of one
indirect inclusion of sched.h. There's another indirect inclusion
of sched.h from gigaset.h via interrupt.h, hardirq.h and
smp_lock.h, but that one only operates if CONFIG_PREEMPT is set.
So the reason I did not see the build failure myself was that I
only tested with CONFIG_PREEMPT=y.

> ---
>  drivers/isdn/gigaset/gigaset.h |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
> index d32efb6..05947f9 100644
> --- a/drivers/isdn/gigaset/gigaset.h
> +++ b/drivers/isdn/gigaset/gigaset.h
> @@ -20,6 +20,7 @@
>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>  
>  #include <linux/kernel.h>
> +#include <linux/sched.h>
>  #include <linux/compiler.h>
>  #include <linux/types.h>
>  #include <linux/ctype.h>

Acked-by: Tilman Schmidt <tilman@imap.cc>

in case it still matters.

Thanks again,
Tilman

Patch

diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index d32efb6..05947f9 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -20,6 +20,7 @@ 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/kernel.h>
+#include <linux/sched.h>
 #include <linux/compiler.h>
 #include <linux/types.h>
 #include <linux/ctype.h>