Merge branch 'master' into next

diff --combined drivers/char/tpm/tpm.c
index f4c68ab,45d5800..aeafac5
--- 1/drivers/char/tpm/tpm.c
--- 2/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@@ -31,7 -31,7 +31,7 @@@
  
  enum tpm_const {
        TPM_MINOR = 224,        /* officially assigned */
 -      TPM_BUFSIZE = 2048,
 +      TPM_BUFSIZE = 4096,
        TPM_NUM_DEVICES = 256,
  };
  
@@@ -696,7 -696,7 +696,7 @@@ int __tpm_pcr_read(struct tpm_chip *chi
  
        cmd.header.in = pcrread_header;
        cmd.params.pcrread_in.pcr_idx = cpu_to_be32(pcr_idx);
-       BUILD_BUG_ON(cmd.header.in.length > READ_PCR_RESULT_SIZE);
+       BUG_ON(cmd.header.in.length > READ_PCR_RESULT_SIZE);
        rc = transmit_cmd(chip, &cmd, cmd.header.in.length,
                          "attempting to read a pcr value");
  
@@@ -742,7 -742,7 +742,7 @@@ EXPORT_SYMBOL_GPL(tpm_pcr_read)
   * the module usage count.
   */
  #define TPM_ORD_PCR_EXTEND cpu_to_be32(20)
- #define EXTEND_PCR_SIZE 34
+ #define EXTEND_PCR_RESULT_SIZE 34
  static struct tpm_input_header pcrextend_header = {
        .tag = TPM_TAG_RQU_COMMAND,
        .length = cpu_to_be32(34),
@@@ -760,10 -760,9 +760,9 @@@ int tpm_pcr_extend(u32 chip_num, int pc
                return -ENODEV;
  
        cmd.header.in = pcrextend_header;
-       BUILD_BUG_ON(be32_to_cpu(cmd.header.in.length) > EXTEND_PCR_SIZE);
        cmd.params.pcrextend_in.pcr_idx = cpu_to_be32(pcr_idx);
        memcpy(cmd.params.pcrextend_in.hash, hash, TPM_DIGEST_SIZE);
-       rc = transmit_cmd(chip, &cmd, cmd.header.in.length,
+       rc = transmit_cmd(chip, &cmd, EXTEND_PCR_RESULT_SIZE,
                          "attempting extend a PCR value");
  
        module_put(chip->dev->driver->owner);