Fix a problem that occurs if for some reason the UV4 EFI System Table is not available, the check inadvertantly can cause a panic.
Reviewed-by: Dimitri Sivanich <[email protected]> Reviewed-by: Nathan Zimmer <[email protected]> Tested-by: Frank Ramsay <[email protected]> Tested-by: John Estabrook <[email protected]> Signed-off-by: Mike Travis <[email protected]> --- arch/x86/platform/uv/bios_uv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- linux-3.12.orig/arch/x86/platform/uv/bios_uv.c +++ linux-3.12/arch/x86/platform/uv/bios_uv.c @@ -201,11 +201,12 @@ void uv_bios_init(void) } if (uv_systab->revision >= UV_SYSTAB_VERSION_UV4) { + int size = uv_systab->size; + iounmap(uv_systab); - uv_systab = ioremap(efi.uv_systab, uv_systab->size); + uv_systab = ioremap(efi.uv_systab, size); if (!uv_systab) { - pr_err("UV: UVsystab: ioremap(%d) failed!\n", - uv_systab->size); + pr_err("UV: UVsystab: ioremap(%d) failed!\n", size); return; } } --
