2010-04-02 10:11:29

by Samuel Ortiz

[permalink] [raw]
Subject: Re: [PATCH 12/17] mfd: update gfp/slab.h includes

Hi Tejun,

On Tue, Mar 30, 2010 at 02:52:40AM +0900, Tejun Heo wrote:
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
The davinci MFD driver is sitting in Mark's tree, so I guess he should take
this patch.
Mark, feel free to add my:
Acked-by: Samuel Ortiz <[email protected]>

to this patch.

Cheers,
Samuel.


> Signed-off-by: Tejun Heo <[email protected]>
> Cc: Stephen Rothwell <[email protected]>
> Cc: Samuel Ortiz <[email protected]>
> ---
> drivers/gpio/rdc321x-gpio.c | 1 +
> drivers/mfd/davinci_voicecodec.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/gpio/rdc321x-gpio.c b/drivers/gpio/rdc321x-gpio.c
> index 46c5519..e344907 100644
> --- a/drivers/gpio/rdc321x-gpio.c
> +++ b/drivers/gpio/rdc321x-gpio.c
> @@ -27,6 +27,7 @@
> #include <linux/pci.h>
> #include <linux/gpio.h>
> #include <linux/mfd/rdc321x.h>
> +#include <linux/slab.h>
>
> struct rdc321x_gpio {
> spinlock_t lock;
> diff --git a/drivers/mfd/davinci_voicecodec.c b/drivers/mfd/davinci_voicecodec.c
> index 9886aa8..3e75f02 100644
> --- a/drivers/mfd/davinci_voicecodec.c
> +++ b/drivers/mfd/davinci_voicecodec.c
> @@ -23,6 +23,7 @@
> #include <linux/init.h>
> #include <linux/module.h>
> #include <linux/device.h>
> +#include <linux/slab.h>
> #include <linux/delay.h>
> #include <linux/io.h>
> #include <linux/clk.h>
> --
> 1.6.4.2
>

--
Intel Open Source Technology Centre
http://oss.intel.com/


2010-04-02 16:09:07

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH 12/17] mfd: update gfp/slab.h includes

On Fri, Apr 02, 2010 at 12:12:00PM +0200, Samuel Ortiz wrote:
> Hi Tejun,
>
> On Tue, Mar 30, 2010 at 02:52:40AM +0900, Tejun Heo wrote:
> > Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> > gfp.h or slab.h is included as necessary.
> The davinci MFD driver is sitting in Mark's tree, so I guess he should take
> this patch.
> Mark, feel free to add my:
> Acked-by: Samuel Ortiz <[email protected]>

> to this patch.

Unfortunately drivers/gpio/rdc321x-gpio.c isn't in mainline yet so the
patch doesn't apply cleanly to ASoC either. I've applied the DaVinci
hunk, the other will need to go via your tree.

2010-04-02 16:25:14

by Samuel Ortiz

[permalink] [raw]
Subject: Re: [PATCH 12/17] mfd: update gfp/slab.h includes

On Fri, Apr 02, 2010 at 05:08:55PM +0100, Mark Brown wrote:
> On Fri, Apr 02, 2010 at 12:12:00PM +0200, Samuel Ortiz wrote:
> > Hi Tejun,
> >
> > On Tue, Mar 30, 2010 at 02:52:40AM +0900, Tejun Heo wrote:
> > > Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> > > gfp.h or slab.h is included as necessary.
> > The davinci MFD driver is sitting in Mark's tree, so I guess he should take
> > this patch.
> > Mark, feel free to add my:
> > Acked-by: Samuel Ortiz <[email protected]>
>
> > to this patch.
>
> Unfortunately drivers/gpio/rdc321x-gpio.c isn't in mainline yet so the
> patch doesn't apply cleanly to ASoC either. I've applied the DaVinci
> hunk, the other will need to go via your tree.
Thanks, I'm pushing the rdc321x part.

Cheers,
Samuel.


--
Intel Open Source Technology Centre
http://oss.intel.com/

2010-04-03 00:07:20

by Stephen Rothwell

[permalink] [raw]
Subject: Re: [PATCH 12/17] mfd: update gfp/slab.h includes

Hi Samuel, Mark,

On Fri, 2 Apr 2010 18:25:47 +0200 Samuel Ortiz <[email protected]> wrote:
>
> On Fri, Apr 02, 2010 at 05:08:55PM +0100, Mark Brown wrote:
> > On Fri, Apr 02, 2010 at 12:12:00PM +0200, Samuel Ortiz wrote:
> > > Hi Tejun,
> > >
> > > On Tue, Mar 30, 2010 at 02:52:40AM +0900, Tejun Heo wrote:
> > > > Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> > > > gfp.h or slab.h is included as necessary.
> > > The davinci MFD driver is sitting in Mark's tree, so I guess he should take
> > > this patch.
> > > Mark, feel free to add my:
> > > Acked-by: Samuel Ortiz <[email protected]>
> >
> > > to this patch.
> >
> > Unfortunately drivers/gpio/rdc321x-gpio.c isn't in mainline yet so the
> > patch doesn't apply cleanly to ASoC either. I've applied the DaVinci
> > hunk, the other will need to go via your tree.
> Thanks, I'm pushing the rdc321x part.

Thanks, guys.

--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/


Attachments:
(No filename) (1.00 kB)
(No filename) (198.00 B)
Download all attachments