LinuxLists.cc - [GIT PULL] break implicit percpu.h -> slab.h dependency

2010-04-05 03:50:56

Subject: [GIT PULL] break implicit percpu.h -> slab.h dependency

2010-04-06 09:25:44

by Ingo Molnar

[permalink] [raw]

Subject: Re: [GIT PULL] break implicit percpu.h -> slab.h dependency

* Tejun Heo <[email protected]> wrote:

> git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git slabh
>
> This is rather unusual pull request at this stage in -rc cycles but
> given the mostly trivial nature and massive size of this change, I
> think it would be beneficial to merge this while the tree isn't
> changing too rapidly and as early as possible so that further
> breakages aren't introduced.

FYI, -tip testing found a build breakage with your changes:

drivers/base/node.c:373: error: implicit declaration of function 'kmalloc'
drivers/base/node.c:377: error: implicit declaration of function 'kfree'

The fix is below. Since my first test today triggered a build failure i'd
expect there to be more - i'll send all subsequent fixes to this thread.

Thanks,

Ingo

Index: linux2/drivers/base/node.c
===================================================================
--- linux2.orig/drivers/base/node.c
+++ linux2/drivers/base/node.c
@@ -16,6 +16,7 @@
#include <linux/device.h>
#include <linux/swap.h>
#include <linux/gfp.h>
+#include <linux/slab.h>

static struct sysdev_class_attribute *node_state_attrs[];

2010-04-06 09:39:05

by Tejun Heo

[permalink] [raw]

Subject: Re: [GIT PULL] break implicit percpu.h -> slab.h dependency

Hello, Ingo.

On 04/06/2010 06:25 PM, Ingo Molnar wrote:
> FYI, -tip testing found a build breakage with your changes:
>
> drivers/base/node.c:373: error: implicit declaration of function 'kmalloc'
> drivers/base/node.c:377: error: implicit declaration of function 'kfree'

These are NODEMASK_ALLOC() and NODEMASK_FREE() macros which become
kmalloc/kfree() iff NODES_SHIFT > 8. I'll grep for these macros and
commit a proper fix.

> The fix is below. Since my first test today triggered a build failure i'd
> expect there to be more - i'll send all subsequent fixes to this thread.

Thanks. Much appreciated.

--
tejun

2010-04-06 09:50:38

by Ingo Molnar

[permalink] [raw]

Subject: Re: [GIT PULL] break implicit percpu.h -> slab.h dependency

* Tejun Heo <[email protected]> wrote:

> Hello, Ingo.
>
> On 04/06/2010 06:25 PM, Ingo Molnar wrote:
> > FYI, -tip testing found a build breakage with your changes:
> >
> > drivers/base/node.c:373: error: implicit declaration of function 'kmalloc'
> > drivers/base/node.c:377: error: implicit declaration of function 'kfree'
>
> These are NODEMASK_ALLOC() and NODEMASK_FREE() macros which become
> kmalloc/kfree() iff NODES_SHIFT > 8. I'll grep for these macros and
> commit a proper fix.
>
> > The fix is below. Since my first test today triggered a build failure i'd
> > expect there to be more - i'll send all subsequent fixes to this thread.
>
> Thanks. Much appreciated.

It's looking pretty good so far with about a dozen tests passed. Thanks for
doing this transition so carefully!

Ingo

2010-04-06 21:38:39

by Tejun Heo

[permalink] [raw]

Subject: [PATCH #slabh] nodemask: include slab.h from drivers/base/node.c

NODEMASK_ALLOC/FREE are mapped to kmalloc/free if NODES_SHIFT > 8.
Among its several users, drivers/base/node.c wasn't including slab.h
leading to build failure if NODES_SHIFT > 8. Include slab.h from
drivers/base/node.c.

This isn't an ideal solution but including slab.h directly from
nodemask.h is not an option because nodemask.h gets included
everywhere. For now, make it work by including slab.h from its users.

Signed-off-by: Tejun Heo <[email protected]>
Reported-by: Ingo Molnar <[email protected]>
---
drivers/base/node.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 985abd7..057979a 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -15,7 +15,7 @@
#include <linux/cpu.h>
#include <linux/device.h>
#include <linux/swap.h>
-#include <linux/gfp.h>
+#include <linux/slab.h>

static struct sysdev_class_attribute *node_state_attrs[];

--
1.6.4.2

2010-04-06 21:50:22

by Tejun Heo

[permalink] [raw]

Subject: Re: [GIT PULL] break implicit percpu.h -> slab.h dependency

Linus, can you please pull once more from the slabh branch?

git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git slabh

It has the following single fix for build failure spotted by Ingo
during -tip testing.

Thanks.

Tejun Heo (1):
nodemask: include slab.h from drivers/base/node.c

drivers/base/node.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

--
tejun