From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754556Ab0C2Hea (ORCPT <rfc822;w@1wt.eu>);
	Mon, 29 Mar 2010 03:34:30 -0400
Received: from cantor.suse.de ([195.135.220.2]:52475 "EHLO mx1.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754452Ab0C2He2 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 29 Mar 2010 03:34:28 -0400
Date: Mon, 29 Mar 2010 09:34:26 +0200
Message-ID: <s5haatr4m4d.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Tejun Heo <tj@kernel.org>, linux-next@vger.kernel.org,
       linux-kernel@vger.kernel.org, Misael Lopez Cruz <x0052729@ti.com>,
       Jorge Eduardo Candelaria <jorge.candelaria@ti.com>,
       Margarita Olaya Cabrera <magi.olaya@ti.com>,
       Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: Re: linux-next: build failure after merge of the slabh tree
In-Reply-To: <20100329175551.873d9fab.sfr@canb.auug.org.au>
References: <20100329175551.873d9fab.sfr@canb.auug.org.au>
User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

At Mon, 29 Mar 2010 17:55:51 +1100,
Stephen Rothwell wrote:
> 
> Hi Tejun,
> 
> After merging the slabh tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> sound/soc/codecs/twl6040.c: In function 'twl6040_remove':
> sound/soc/codecs/twl6040.c:1052: error: implicit declaration of function 'kfree'
> sound/soc/codecs/twl6040.c: In function 'twl6040_codec_probe':
> sound/soc/codecs/twl6040.c:1073: error: implicit declaration of function 'kzalloc'
> sound/soc/codecs/twl6040.c:1073: warning: assignment makes pointer from integer without a cast
> 
> Caused by commit d103d3b3e8512312b5254950035366d4422a479a ("percpu: don't
> implicitly include slab.h from percpu.h") from the slabh tree interacting
> with commit 8ecbabd977dc64d2d8c9980420a3d72db06fe551 ("ASoC: TWL6040: Add
> twl6040 codec driver") from the sound tree.
> 
> I applied the following merge fixup patch which should be applied to the
> sound tree (see Documentation/SubmitChecklist Rule #1 :-)).  Hi Takashi,
> another one. :-(
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 29 Mar 2010 17:52:52 +1100
> Subject: [PATCH] Asoc: TWL6040: use of kzalloc/kfree requires the include of slab.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied to sound tree.  Thanks.


Takashi

> ---
>  sound/soc/codecs/twl6040.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
> index 0e4dce7..108c51a 100755
> --- a/sound/soc/codecs/twl6040.c
> +++ b/sound/soc/codecs/twl6040.c
> @@ -27,6 +27,7 @@
>  #include <linux/i2c.h>
>  #include <linux/gpio.h>
>  #include <linux/platform_device.h>
> +#include <linux/slab.h>
>  #include <linux/i2c/twl.h>
>  
>  #include <sound/core.h>
> -- 
> 1.7.0.3
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>