The patch titled build_bug_on-fix-it-and-a-couple-of-bogus-uses-of-it-fix has been added to the -mm tree. Its filename is build_bug_on-fix-it-and-a-couple-of-bogus-uses-of-it-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: build_bug_on-fix-it-and-a-couple-of-bogus-uses-of-it-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> More nonsensical assertions in tpm.c.. Cc: Rajiv Andrade <srajiv@xxxxxxxxxxxxxxxxxx> Cc: Mimi Zohar <zohar@xxxxxxxxxx> Cc: James Morris <jmorris@xxxxxxxxx> Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> Cc: "Jan Beulich" <JBeulich@xxxxxxxxxx> Cc: Andi Kleen <andi@xxxxxxxxxxxxxx> Cc: Catalin Marinas <catalin.marinas@xxxxxxx> Cc: Jan Beulich <jbeulich@xxxxxxxxxx> Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/char/tpm/tpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/char/tpm/tpm.c~build_bug_on-fix-it-and-a-couple-of-bogus-uses-of-it-fix drivers/char/tpm/tpm.c --- a/drivers/char/tpm/tpm.c~build_bug_on-fix-it-and-a-couple-of-bogus-uses-of-it-fix +++ a/drivers/char/tpm/tpm.c @@ -696,7 +696,7 @@ int __tpm_pcr_read(struct tpm_chip *chip 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"); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch printk-boot_delay-rename-printk_delay_msec-to-loops_per_msec.patch printk-add-printk_delay-to-make-messages-readable-for-some-scenarios.patch generic-ipi-make-struct-call_function_data-lockless.patch proc-connector-add-event-for-process-becoming-session-leader.patch build_bug_on-fix-it-and-a-couple-of-bogus-uses-of-it.patch build_bug_on-fix-it-and-a-couple-of-bogus-uses-of-it-fix.patch mmc-register-mmci-omap-hs-using-platform_driver_probe.patch sdio-add-cd-disable-support.patch sdio-add-mmc_quirk_lenient_fn0.patch at91-atmel-mci-platform-configuration-to-the-the-atmel-mci-driver.patch mmc-core-sdio-suspend-resume-support.patch procfs-provide-stack-information-for-threads-v08.patch kcore-register-vmemmap-range.patch rtc-add-driver-for-mxcs-internal-rtc-module.patch davinci-fb-frame-buffer-driver-for-ti-da8xx-omap-l1xx.patch davinci-fb-frame-buffer-driver-for-ti-da8xx-omap-l1xx-v4.patch drivers-video-add-kmalloc-null-tests.patch drivers-video-tmiofbc-fix-uninitialised-return-value.patch v3-minixfs-add-missing-directory-type-checking.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html