[uClinux-dev] [PATCH 6/9] nios2: Updates for kernel 2.6.23

[Atle Nissestad]

Fix most of the 'section mismatch' warnings

Signed-off-by: Atle Nissestad <atle at nissestad.no>

diff --git a/linux-2.6.x/arch/nios2nommu/kernel/start.c b/linux-2.6.x/arch/nios2nommu/kernel/start.c
index d14a584..bca81fc 100644
--- a/linux-2.6.x/arch/nios2nommu/kernel/start.c
+++ b/linux-2.6.x/arch/nios2nommu/kernel/start.c
@@ -31,6 +31,7 @@
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <linux/time.h>
+#include <linux/start_kernel.h>
 
   #ifdef CONFIG_SERIAL_AJUART                       //;dgt;20may05;
     #ifdef CONFIG_SERIAL_AJUART_CONSOLE             //;dgt;20may05;
@@ -381,7 +382,6 @@ int  Test_Flash_Regions(void)
 
 
 int main(void) {
-	extern void start_kernel(void);
 
 #ifdef DEBUG
 	puts("MAIN: starting c\n");
diff --git a/linux-2.6.x/arch/nios2nommu/mm/init.c b/linux-2.6.x/arch/nios2nommu/mm/init.c
index 9cc985e..21fe61b 100644
--- a/linux-2.6.x/arch/nios2nommu/mm/init.c
+++ b/linux-2.6.x/arch/nios2nommu/mm/init.c
@@ -104,7 +104,7 @@ extern unsigned long memory_end;
  * The parameters are pointers to where to stick the starting and ending
  * addresses of available kernel virtual memory.
  */
-void paging_init(void)
+void __init paging_init(void)
 {
 	/*
 	 * Make sure start_mem is page aligned, otherwise bootmem and
@@ -153,7 +153,7 @@ void paging_init(void)
 	}
 }
 
-void mem_init(void)
+void __init mem_init(void)
 {
 	int codek = 0, datak = 0, initk = 0;
 	unsigned long tmp;
@@ -191,7 +191,7 @@ void mem_init(void)
 
 
 #ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
+void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
 	int pages = 0;
 	for (; start < end; start += PAGE_SIZE) {
@@ -205,8 +205,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 }
 #endif
 
-void
-free_initmem()
+void free_initmem(void)
 {
 #ifdef CONFIG_RAMKERNEL
 	unsigned long addr;
-- 
1.5.3.2