Re: linux-next: build failure after merge of the tpmdd tree

[Jarkko Sakkinen]

On Thu, 2016-04-28 at 15:32 +1000, Stephen Rothwell wrote:
> Hi Jarkko,
> 
> After merging the tpmdd tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> In file included from /home/sfr/next/next/include/linux/rcupdate.h:38:0,
> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂfrom /home/sfr/next/next/include/linux/idr.h:18,
> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂfrom /home/sfr/next/next/include/linux/kernfs.h:14,
> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂfrom /home/sfr/next/next/include/linux/sysfs.h:15,
> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂfrom /home/sfr/next/next/include/linux/kobject.h:21,
> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂfrom /home/sfr/next/next/include/linux/device.h:17,
> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂfrom /home/sfr/next/next/include/linux/dma-mapping.h:6,
> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂfrom /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c:18:
> /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c: In function 'tpm_ibmvtpm_probe':
> /home/sfr/next/next/include/linux/spinlock.h:295:1: error: expected ';' before 'do'
> Âdo {ÂÂÂÂÂÂÂ\
> Â^
> /home/sfr/next/next/drivers/char/tpm/tpm_ibmvtpm.c:632:2: note: in expansion of macro
> 'spin_lock_init'
> Â spin_lock_init(&ibmvtpm->rtce_lock);
> Â ^
> 
> Caused by commit
> 
> Â 28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific")
> 
> A ';' was missed.
> 
> I added the following patch for today.

Sorry about this and thank you.

/Jarkko

> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Thu, 28 Apr 2016 15:27:17 +1000
> Subject: [PATCH] tpm: fix for typo in tpm/tpm_ibmvtpm.c
> 
> Fixes: 28157164b056 ("tpm: Remove useless priv field in struct tpm_vendor_specific")
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
> Âdrivers/char/tpm/tpm_ibmvtpm.c | 2 +-
> Â1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
> index 6b22826f0e11..946025a7413b 100644
> --- a/drivers/char/tpm/tpm_ibmvtpm.c
> +++ b/drivers/char/tpm/tpm_ibmvtpm.c
> @@ -627,7 +627,7 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
> Â
> Â	crq_q->index = 0;
> Â
> -	dev_set_drvdata(&chip->dev, ibmvtpm)
> +	dev_set_drvdata(&chip->dev, ibmvtpm);
> Â
> Â	spin_lock_init(&ibmvtpm->rtce_lock);
> Â
> --Â
> 2.7.0
>