Merge tag 'gvt-fixes-2019-03-21' of https://github.com/intel/gvt-linux into drm-intel...

[linux-2.6-microblaze.git] / arch / alpha / kernel / core_cia.c

diff --git a/arch/alpha/kernel/core_cia.c b/arch/alpha/kernel/core_cia.c
index 867e873..f489170 100644 (file)
--- a/arch/alpha/kernel/core_cia.c
+++ b/arch/alpha/kernel/core_cia.c
@@ -331,7 +331,10 @@ cia_prepare_tbia_workaround(int window)
        long i;
 
        /* Use minimal 1K map. */
-       ppte = memblock_alloc_from(CIA_BROKEN_TBIA_SIZE, 32768, 0);
+       ppte = memblock_alloc(CIA_BROKEN_TBIA_SIZE, 32768);
+       if (!ppte)
+               panic("%s: Failed to allocate %u bytes align=0x%x\n",
+                     __func__, CIA_BROKEN_TBIA_SIZE, 32768);
        pte = (virt_to_phys(ppte) >> (PAGE_SHIFT - 1)) | 1;
 
        for (i = 0; i < CIA_BROKEN_TBIA_SIZE / sizeof(unsigned long); ++i)