ff76ec18ca
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
Repairs linux-next's
commit d6ba452128
Author: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Mon Oct 26 09:26:18 2009 -0400
tpm add default function definitions
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Cc: Mimi Zohar <zohar@us.ibm.com>
Cc: James Morris <jmorris@namei.org>
Cc: Eric Paris <eparis@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Morris <jmorris@namei.org>
43 lines
1.2 KiB
C
43 lines
1.2 KiB
C
/*
|
|
* Copyright (C) 2004,2007,2008 IBM Corporation
|
|
*
|
|
* Authors:
|
|
* Leendert van Doorn <leendert@watson.ibm.com>
|
|
* Dave Safford <safford@watson.ibm.com>
|
|
* Reiner Sailer <sailer@watson.ibm.com>
|
|
* Kylene Hall <kjhall@us.ibm.com>
|
|
* Debora Velarde <dvelarde@us.ibm.com>
|
|
*
|
|
* Maintained by: <tpmdd_devel@lists.sourceforge.net>
|
|
*
|
|
* Device driver for TCG/TCPA TPM (trusted platform module).
|
|
* Specifications at www.trustedcomputinggroup.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation, version 2 of the
|
|
* License.
|
|
*
|
|
*/
|
|
#ifndef __LINUX_TPM_H__
|
|
#define __LINUX_TPM_H__
|
|
|
|
/*
|
|
* Chip num is this value or a valid tpm idx
|
|
*/
|
|
#define TPM_ANY_NUM 0xFFFF
|
|
|
|
#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);
|
|
#else
|
|
static inline int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf) {
|
|
return -ENODEV;
|
|
}
|
|
static inline int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash) {
|
|
return -ENODEV;
|
|
}
|
|
#endif
|
|
#endif
|