Messages in this thread | | | Date | Sun, 1 May 2016 23:12:22 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: build failure after merge of the tpmdd tree |
| |
Hi Jarkko,
On Thu, 28 Apr 2016 12:02:24 +0300 Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> wrote: > > 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@canb.auug.org.au> > > 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@canb.auug.org.au> > > --- > > 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 > >
Ping?
-- Cheers, Stephen Rothwell
| |