1 files changed, 20 insertions, 10 deletions

diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c
index 16dc43e9d940..fa015565001b 100644
--- a/arch/um/kernel/initrd.c
+++ b/arch/um/kernel/initrd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
@@ -7,7 +7,6 @@
 #include "linux/bootmem.h"
 #include "linux/initrd.h"
 #include "asm/types.h"
-#include "kern_util.h"
 #include "initrd.h"
 #include "init.h"
 #include "os.h"
@@ -21,18 +20,27 @@ static int __init read_initrd(void)
         long long size;
         int err;
 
-        if(initrd == NULL)
+        if (initrd == NULL)
                 return 0;
 
         err = os_file_size(initrd, &size);
-        if(err)
+        if (err)
                 return 0;
 
+        /*
+         * This is necessary because alloc_bootmem craps out if you
+         * ask for no memory.
+         */
+        if (size == 0) {
+                printk(KERN_ERR "\"%\" is a zero-size initrd\n");
+                return 0;
+        }
+
         area = alloc_bootmem(size);
-        if(area == NULL)
+        if (area == NULL)
                 return 0;
 
-        if(load_initrd(initrd, area, size) == -1)
+        if (load_initrd(initrd, area, size) == -1)
                 return 0;
 
         initrd_start = (unsigned long) area;
@@ -59,13 +67,15 @@ int load_initrd(char *filename, void *buf, int size)
         int fd, n;
 
         fd = os_open_file(filename, of_read(OPENFLAGS()), 0);
-        if(fd < 0){
-                printk("Opening '%s' failed - err = %d\n", filename, -fd);
+        if (fd < 0) {
+                printk(KERN_ERR "Opening '%s' failed - err = %d\n", filename,
+                       -fd);
                 return -1;
         }
         n = os_read_file(fd, buf, size);
-        if(n != size){
-                printk("Read of %d bytes from '%s' failed, err = %d\n", size,
+        if (n != size) {
+                printk(KERN_ERR "Read of %d bytes from '%s' failed, "
+                       "err = %d\n", size,
                        filename, -n);
                 return -1;
         }