3.16.7-ckt26 -stable review patch. If anyone has any objections, please let me know.
---8<------------------------------------------------------------ From: Luis Henriques <[email protected]> This reverts commit 0f7b4f7914e450b1bcffdbd26bbf35ee304cbfea, which was commit ff4319dc7cd58c92b389960e375038335d157a60 upstream. This commit introduced a regression in this kernel. Commit 95be58df74a5 ("firmware: dmi_scan: Use full dmi version for SMBIOS3") added support for SMBIOS3. However, this was not backport to this kernel version, and thus commit ff4319dc7cd5 should have not been applied. BugLink: https://bugs.launchpad.net/bugs/1551419 Signed-off-by: Luis Henriques <[email protected]> --- drivers/firmware/dmi_scan.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 48142b88e672..35286fe52823 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -493,7 +493,6 @@ static int __init dmi_present(const u8 *buf) dmi_ver = smbios_ver; else dmi_ver = (buf[14] & 0xF0) << 4 | (buf[14] & 0x0F); - dmi_ver <<= 8; dmi_num = (buf[13] << 8) | buf[12]; dmi_len = (buf[7] << 8) | buf[6]; dmi_base = (buf[11] << 24) | (buf[10] << 16) | @@ -502,10 +501,10 @@ static int __init dmi_present(const u8 *buf) if (dmi_walk_early(dmi_decode) == 0) { if (smbios_ver) { pr_info("SMBIOS %d.%d present.\n", - dmi_ver >> 16, (dmi_ver >> 8) & 0xFF); + dmi_ver >> 8, dmi_ver & 0xFF); } else { pr_info("Legacy DMI %d.%d present.\n", - dmi_ver >> 16, (dmi_ver >> 8) & 0xFF); + dmi_ver >> 8, dmi_ver & 0xFF); } dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string)); printk(KERN_DEBUG "DMI: %s\n", dmi_ids_string);
