manual merge of core/efi

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc drivers/firmware/dmi_scan.c
index 2eebd28b4c40af2789c32e0008f2b60006fc03ac,c9cb725520c557b0262fed0f3bda78252a3abd48..37a78c46812328899d1c027055152d48cc2b5937
--- 1/drivers/firmware/dmi_scan.c
--- 2/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@@ -86,13 -88,11 +88,13 @@@ static void dmi_table(u8 *buf
        int i = 0;
  
        /*
 -       *      Stop when we see all the items the table claimed to have
 -       *      OR we run off the end of the table (also happens)
 +       * Stop when we have seen all the items the table claimed to have
 +       * (SMBIOS < 3.0 only) OR we reach an end-of-table marker OR we run
 +       * off the end of the table (should never happen but sometimes does
 +       * on bogus implementations.)
         */
-       while ((!num || i < num) &&
-              (data - buf + sizeof(struct dmi_header)) <= len) {
 -      while ((i < dmi_num) && (data - buf + sizeof(struct dmi_header))
 -              <= dmi_len) {
++      while ((!dmi_num || i < dmi_num) &&
++             (data - buf + sizeof(struct dmi_header)) <= dmi_len) {
                const struct dmi_header *dm = (const struct dmi_header *)data;
  
                /*
@@@ -531,14 -531,27 +533,16 @@@ static int __init dmi_smbios3_present(c
  {
        if (memcmp(buf, "_SM3_", 5) == 0 &&
            buf[6] < 32 && dmi_checksum(buf, buf[6])) {
-               dmi_ver = get_unaligned_be16(buf + 7);
 +              dmi_num = 0;                    /* No longer specified */
+               dmi_ver = get_unaligned_be32(buf + 6);
+               dmi_ver &= 0xFFFFFF;
                dmi_len = get_unaligned_le32(buf + 12);
                dmi_base = get_unaligned_le64(buf + 16);
  
 -              /*
 -               * The 64-bit SMBIOS 3.0 entry point no longer has a field
 -               * containing the number of structures present in the table.
 -               * Instead, it defines the table size as a maximum size, and
 -               * relies on the end-of-table structure type (#127) to be used
 -               * to signal the end of the table.
 -               * So let's define dmi_num as an upper bound as well: each
 -               * structure has a 4 byte header, so dmi_len / 4 is an upper
 -               * bound for the number of structures in the table.
 -               */
 -              dmi_num = dmi_len / 4;
 -
                if (dmi_walk_early(dmi_decode) == 0) {
-                       pr_info("SMBIOS %d.%d present.\n",
-                               dmi_ver >> 8, dmi_ver & 0xFF);
+                       pr_info("SMBIOS %d.%d.%d present.\n",
+                               dmi_ver >> 16, (dmi_ver >> 8) & 0xFF,
+                               dmi_ver & 0xFF);
                        dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string));
                        pr_debug("DMI: %s\n", dmi_ids_string);
                        return 0;