[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20060727122630.GB3381@slug>
Date: Thu, 27 Jul 2006 14:26:30 +0200
From: Frederik Deweerdt <deweerdt@...e.fr>
To: Andrew Morton <akpm@...l.org>
Cc: linux-kernel@...r.kernel.org, hostmaster@...soft.at
Subject: Re: 2.6.18-rc2-mm1
On Thu, Jul 27, 2006 at 01:56:39AM -0700, Andrew Morton wrote:
>
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.18-rc2/2.6.18-rc2-mm1/
>
Hi,
Compiling on i386 without the CONFIG_EFI enabled complains because it can't find
efi_init_e820_map prototype:
arch/i386/kernel/setup.c: In function `setup_arch':
arch/i386/kernel/setup.c:1560: warning: implicit declaration of function `efi_init_e820_map'
The attached corrects this, and also makes efi_init_e820_map static.
Regards,
Frederik
Signed-off-by: Frederik Deweerdt <frederik.deweerdt@...il.com>
--- v2.6.18-rc2-mm1~ori/arch/i386/kernel/setup.c 2006-07-27 11:46:05.000000000 +0200
+++ v2.6.18-rc2-mm1/arch/i386/kernel/setup.c 2006-07-27 11:51:02.000000000 +0200
@@ -1453,7 +1453,7 @@ static void set_mca_bus(int x) { }
/*
* Make a e820 memory map
*/
-void __init efi_init_e820_map(void)
+static void __init efi_init_e820_map(void)
{
efi_memory_desc_t *md;
unsigned long long start = 0;
@@ -1505,7 +1505,9 @@ void __init efi_init_e820_map(void)
}
}
}
-#endif
+#else
+static void __init efi_init_e820_map(void) { }
+#endif /* CONFIG_EFI */
/*
* Determine if we were loaded by an EFI loader. If so, then we have also been
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists