]> xenbits.xensource.com Git - xenclient/kernel.git/commitdiff
[IA64] remove warning.
authorIsaku Yamahata <yamahata@valinux.co.jp>
Mon, 28 Jul 2008 08:22:45 +0000 (17:22 +0900)
committerIsaku Yamahata <yamahata@valinux.co.jp>
Mon, 28 Jul 2008 08:22:45 +0000 (17:22 +0900)
This patch removes the following warning.

> linux-2.6.18-xen.hg/arch/ia64/kernel/efi.c: In function 'efi_initialize_iomem_machine_resources':
> linux-2.6.18-xen.hg/arch/ia64/kernel/efi.c:1185: warning: control reaches end of non-void function

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
arch/ia64/kernel/efi.c

index e24973b33e74d21d9b6988d2d069363de8297130..2f5b0b48cade323d763146652d15a3faece23c76 100644 (file)
@@ -1149,7 +1149,7 @@ efi_initialize_resources(void *efi_map_start, void *efi_map_end,
 }
 
 #ifdef CONFIG_PROC_IOMEM_MACHINE
-static int
+static void
 efi_initialize_iomem_machine_resources(void)
 {
        unsigned long size;
@@ -1163,7 +1163,7 @@ efi_initialize_iomem_machine_resources(void)
        for (size = 1024; 1; size += 1024) {
                memmap_info = kmalloc(size, GFP_KERNEL);
                if (memmap_info == NULL)
-                       return -ENOMEM;
+                       return; /* -ENOMEM, but no way to return error */
 
                memmap.nr_entries = size;
                set_xen_guest_handle(memmap.buffer, memmap_info);