From: Randy Dunlap <randy.dunlap@oracle•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
tpmdd-devel@lists•sourceforge.net
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
akpm <akpm@linux-foundation•org>
Subject: [PATCH -next] tpm: fix header for modular build
Date: Wed, 28 Oct 2009 10:49:26 -0700 [thread overview]
Message-ID: <20091028104926.385d350f.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20091028190643.627f10aa.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle•com>
Fix build for TCG_TPM=m. Header file doesn't handle this
and incorrectly builds stubs.
drivers/char/tpm/tpm.c:720: error: redefinition of 'tpm_pcr_read'
include/linux/tpm.h:35: error:previous definition of 'tpm_pcr_read' was here
drivers/char/tpm/tpm.c:752: error: redefinition of 'tpm_pcr_extend'
include/linux/tpm.h:38: error:previous definition of 'tpm_pcr_extend' was here
Signed-off-by: Randy Dunlap <randy.dunlap@oracle•com>
---
include/linux/tpm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20091028.orig/include/linux/tpm.h
+++ linux-next-20091028/include/linux/tpm.h
@@ -27,7 +27,7 @@
*/
#define TPM_ANY_NUM 0xFFFF
-#if defined(CONFIG_TCG_TPM)
+#if defined(CONFIG_TCG_TPM) || defined(CONFIG_TCG_TPM_MODULE)
extern int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf);
extern int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash);
next prev parent reply other threads:[~2009-10-28 17:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-28 8:06 linux-next: Tree for October 28 Stephen Rothwell
2009-10-28 17:49 ` Randy Dunlap [this message]
2009-10-28 23:08 ` [PATCH -next] wireless: airo_cs needs WEXT_SPY Randy Dunlap
2009-10-28 23:09 ` [PATCH -next] k8.h: add struct bootnode Randy Dunlap
2009-10-29 9:31 ` David Rientjes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091028104926.385d350f.randy.dunlap@oracle.com \
--to=randy.dunlap@oracle$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tpmdd-devel@lists$(echo .)sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox