]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
tpm: fix regression caused by section type conflict of tpm_dev_release() in ppc builds
authorPeter Huewe <peterhuewe@gmx.de>
Mon, 27 May 2013 19:39:57 +0000 (21:39 +0200)
committerPeter Huewe <peterhuewe@gmx.de>
Mon, 27 May 2013 20:09:09 +0000 (22:09 +0200)
The 8119807 commit reintroduced a regression
(error: __ksymtab_tpm_dev_release causes a section type conflict) that was fixed by commit
cbb2ed4.
Fix it for good by adding the prototype to tpm.h so sparse doesn't
complain about it anymore.

Reported-by: Tony Camuso <tcamuso@redhat.com>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
drivers/char/tpm/tpm.c
drivers/char/tpm/tpm.h

index 7c3b3dcbfbc8359e3aad78c60281ea2eecfb9a9d..e3c974a6c522028b96c2df72ab1eb053945b1f43 100644 (file)
@@ -1472,7 +1472,7 @@ EXPORT_SYMBOL_GPL(tpm_dev_vendor_release);
  * Once all references to platform device are down to 0,
  * release all allocated structures.
  */
-static void tpm_dev_release(struct device *dev)
+void tpm_dev_release(struct device *dev)
 {
        struct tpm_chip *chip = dev_get_drvdata(dev);
 
index 43342328870970bdc7bbe74905aa42d8a614042b..a7bfc176ed4316bc8319220f1b73848bc9d74f06 100644 (file)
@@ -332,6 +332,7 @@ extern struct tpm_chip* tpm_register_hardware(struct device *,
                                 const struct tpm_vendor_specific *);
 extern int tpm_open(struct inode *, struct file *);
 extern int tpm_release(struct inode *, struct file *);
+extern void tpm_dev_release(struct device *dev);
 extern void tpm_dev_vendor_release(struct tpm_chip *);
 extern ssize_t tpm_write(struct file *, const char __user *, size_t,
                         loff_t *);