Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 "urgent" leftovers from Ingo Molnar:
 "Pending x86/urgent bits that were not high prio enough to warrant
  -rc-less v3.3-final inclusion."

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, efi: Fix pointer math issue in handle_ramdisks()
  x86/ioapic: Add register level checks to detect bogus io-apic entries
  x86, mce: Fix rcu splat in drain_mce_log_buffer()
  x86, memblock: Move mem_hole_size() to .init

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index fec216f4fbc3..0cdfc0d2315e 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -539,7 +539,7 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image,
                 struct initrd *initrd;
                 efi_file_handle_t *h;
                 efi_file_info_t *info;
-                efi_char16_t filename[256];
+                efi_char16_t filename_16[256];
                 unsigned long info_sz;
                 efi_guid_t info_guid = EFI_FILE_INFO_ID;
                 efi_char16_t *p;
@@ -552,14 +552,14 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image,
                 str += 7;
 
                 initrd = &initrds[i];
-                p = filename;
+                p = filename_16;
 
                 /* Skip any leading slashes */
                 while (*str == '/' || *str == '\\')
                         str++;
 
                 while (*str && *str != ' ' && *str != '\n') {
-                        if (p >= filename + sizeof(filename))
+                        if ((u8 *)p >= (u8 *)filename_16 + sizeof(filename_16))
                                 break;
 
                         *p++ = *str++;
@@ -583,7 +583,7 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image,
                                 goto free_initrds;
                 }
 
-                status = efi_call_phys5(fh->open, fh, &h, filename,
+                status = efi_call_phys5(fh->open, fh, &h, filename_16,
                                         EFI_FILE_MODE_READ, (u64)0);
                 if (status != EFI_SUCCESS)
                         goto close_handles;