2006-09-04 22:12:04

by Adrian Bunk

Subject: [2.6 patch] arch/m68knommu/kernel/setup.c should always #include <asm/pgtable.h>

This patch fixes the following compile error with
CONFIG_BLK_DEV_INITRD=n and -Werror-implicit-function-declaration:

<-- snip -->

...
CC arch/m68knommu/kernel/setup.o
/home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/arch/m68knommu/kernel/setup.c: In function 'setup_arch':
/home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/arch/m68knommu/kernel/setup.c:268: error: implicit declaration of function 'paging_init'
make[2]: *** [arch/m68knommu/kernel/setup.o] Error 1

<-- snip -->

Signed-off-by: Adrian Bunk <[email protected]>

--- linux-2.6.18-rc5-mm1/arch/m68knommu/kernel/setup.c.old 2006-09-05 00:07:42.000000000 +0200
+++ linux-2.6.18-rc5-mm1/arch/m68knommu/kernel/setup.c 2006-09-05 00:08:20.000000000 +0200
@@ -36,10 +36,7 @@
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/machdep.h>
-
-#ifdef CONFIG_BLK_DEV_INITRD
#include <asm/pgtable.h>
-#endif

unsigned long memory_start;
unsigned long memory_end;

2006-09-11 05:01:41

by Greg Ungerer

Subject: Re: [2.6 patch] arch/m68knommu/kernel/setup.c should always #include <asm/pgtable.h>

Hi Adrian,

Adrian Bunk wrote:
> This patch fixes the following compile error with
> CONFIG_BLK_DEV_INITRD=n and -Werror-implicit-function-declaration:
>
> <-- snip -->
>
> ...
> CC arch/m68knommu/kernel/setup.o
> /home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/arch/m68knommu/kernel/setup.c: In function 'setup_arch':
> /home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/arch/m68knommu/kernel/setup.c:268: error: implicit declaration of function 'paging_init'
> make[2]: *** [arch/m68knommu/kernel/setup.o] Error 1
>
> <-- snip -->
>
> Signed-off-by: Adrian Bunk <[email protected]>

Thanks, I'll push that.

Regards
Greg



> --- linux-2.6.18-rc5-mm1/arch/m68knommu/kernel/setup.c.old 2006-09-05 00:07:42.000000000 +0200
> +++ linux-2.6.18-rc5-mm1/arch/m68knommu/kernel/setup.c 2006-09-05 00:08:20.000000000 +0200
> @@ -36,10 +36,7 @@
> #include <asm/setup.h>
> #include <asm/irq.h>
> #include <asm/machdep.h>
> -
> -#ifdef CONFIG_BLK_DEV_INITRD
> #include <asm/pgtable.h>
> -#endif
>
> unsigned long memory_start;
> unsigned long memory_end;
>
>

--
------------------------------------------------------------------------
Greg Ungerer -- Chief Software Dude EMAIL: [email protected]
SnapGear -- a Secure Computing Company PHONE: +61 7 3435 2888
825 Stanley St, FAX: +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com