2004-11-02 07:51:21

by Chuck Ebbert

[permalink] [raw]
Subject: Re: [PATCH 504] m68k: smp_lock.h: Avoid recursive include

Linus Torvalds wrote:
>
> This one is _totally_ broken.
>
> Not only is that include not recursive, but it immediately breaks any SMP
> compile because that header file _needs_ the definition of "task_struct".
>
>
> On Sun, 31 Oct 2004, Geert Uytterhoeven wrote:
> >
> > smp_lock.h: Avoid recursive include
> >
> > --- linux-2.6.10-rc1/include/linux/smp_lock.h 2004-04-28 15:47:31.000000000 +0200
> > +++ linux-m68k-2.6.10-rc1/include/linux/smp_lock.h 2004-10-20 22:24:05.000000000 +0200
> > @@ -2,7 +2,6 @@
> > #define __LINUX_SMPLOCK_H
> >
> > #include <linux/config.h>
> > -#include <linux/sched.h>


Shouldn't you also revert cset 1.2405, also by Geert, which added
<linux/sched.h> to reiserfs_fs.h? Looks like that was done to fix
breakage caused by this change.


--Chuck Ebbert 02-Nov-04 03:48:03


2004-11-02 08:25:27

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH 504] m68k: smp_lock.h: Avoid recursive include

On Tue, 2 Nov 2004, Chuck Ebbert wrote:
> Linus Torvalds wrote:
> > This one is _totally_ broken.
> >
> > Not only is that include not recursive, but it immediately breaks any SMP
> > compile because that header file _needs_ the definition of "task_struct".
> >
> > On Sun, 31 Oct 2004, Geert Uytterhoeven wrote:
> > > smp_lock.h: Avoid recursive include
> > >
> > > --- linux-2.6.10-rc1/include/linux/smp_lock.h 2004-04-28 15:47:31.000000000 +0200
> > > +++ linux-m68k-2.6.10-rc1/include/linux/smp_lock.h 2004-10-20 22:24:05.000000000 +0200
> > > @@ -2,7 +2,6 @@
> > > #define __LINUX_SMPLOCK_H
> > >
> > > #include <linux/config.h>
> > > -#include <linux/sched.h>
>
>
> Shouldn't you also revert cset 1.2405, also by Geert, which added
> <linux/sched.h> to reiserfs_fs.h? Looks like that was done to fix
> breakage caused by this change.

You can discuss about that: reiserfs_fs.h used current including sched.h.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

2004-11-02 21:28:57

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH 504] m68k: smp_lock.h: Avoid recursive include

On Tue, 2 Nov 2004, Geert Uytterhoeven wrote:
> On Tue, 2 Nov 2004, Chuck Ebbert wrote:
> > Linus Torvalds wrote:
> > > This one is _totally_ broken.
> > >
> > > Not only is that include not recursive, but it immediately breaks any SMP
> > > compile because that header file _needs_ the definition of "task_struct".
> > >
> > > On Sun, 31 Oct 2004, Geert Uytterhoeven wrote:
> > > > smp_lock.h: Avoid recursive include
> > > >
> > > > --- linux-2.6.10-rc1/include/linux/smp_lock.h 2004-04-28 15:47:31.000000000 +0200
> > > > +++ linux-m68k-2.6.10-rc1/include/linux/smp_lock.h 2004-10-20 22:24:05.000000000 +0200
> > > > @@ -2,7 +2,6 @@
> > > > #define __LINUX_SMPLOCK_H
> > > >
> > > > #include <linux/config.h>
> > > > -#include <linux/sched.h>
> >
> >
> > Shouldn't you also revert cset 1.2405, also by Geert, which added
> > <linux/sched.h> to reiserfs_fs.h? Looks like that was done to fix
> > breakage caused by this change.
>
> You can discuss about that: reiserfs_fs.h used current including sched.h.
^
Oops, there's a missing `without' here...

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds