lkml.org 
[lkml]   [2010]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 14/17] input: update gfp/slab.h includes
Hi Tejun,

On Tue, 30 Mar 2010 02:52:42 +0900 Tejun Heo <tj@kernel.org> wrote:
>
> Implicit slab.h inclusion via percpu.h is about to go away. Make sure
> gfp.h or slab.h is included as necessary.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
> drivers/char/sysrq.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
> index 532c56c..593562d 100644
> --- a/drivers/char/sysrq.c
> +++ b/drivers/char/sysrq.c
> @@ -41,7 +41,7 @@
> #include <linux/hrtimer.h>
> #include <linux/oom.h>
> #include <linux/input.h>
> -#include <linux/gfp.h>
> +#include <linux/slab.h>
>
> #include <asm/ptrace.h>
> #include <asm/irq_regs.h>

This patch does not apply to the input tree. That tree does not have the
#include <linux/gfp.h>
line (your tree (slabh) adds that later in the linux-next cycle).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2010-03-30 05:25    [from the cache]
©2003-2011 Jasper Spaans