Merge branch 'for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / arch / um / kernel / initrd.c

diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c
index 55cead809b18baccf804dd89dafec13c37eb0af0..48bae81f8dcab2febedc7238f190b985e5da4a13 100644 (file)
--- a/arch/um/kernel/initrd.c
+++ b/arch/um/kernel/initrd.c
@@ -37,8 +37,6 @@ static int __init read_initrd(void)
        }
 
        area = alloc_bootmem(size);
-       if (area == NULL)
-               return 0;
 
        if (load_initrd(initrd, area, size) == -1)
                return 0;