prepare to use initcall to do initialization.

5 files changed, 7 insertions, 52 deletions

diff --git a/libdde_linux26/lib/src/arch/l4/init.c b/libdde_linux26/lib/src/arch/l4/init.c
index 195b1b23..79112f78 100644
--- a/libdde_linux26/lib/src/arch/l4/init.c
+++ b/libdde_linux26/lib/src/arch/l4/init.c
@@ -26,53 +26,8 @@ void __init __attribute__((used)) l4dde26_init(void)
 
 void l4dde26_do_initcalls(void)
 {
-	extern void dde_page_cache_init (void);
-	extern void pci_iommu_init (void);
-	extern void init_workqueues (void);
-	extern void pci_init (void);
-	extern void pci_driver_init (void);
-	extern void pcibus_class_init (void);
-	extern void net_dev_init (void);
-	extern void neigh_init (void);
-	extern void net_ns_init (void);
-	extern void blk_ioc_init (void);
-	extern void blk_settings_init (void);
-	extern void blk_softirq_init (void);
-	extern void genhd_device_init (void);
-	extern void noop_init (void);
-	extern void bdi_class_init (void);
-	extern void init_bio (void);
-	extern void chrdev_init (void);
 	/* finally, let DDEKit perform all the initcalls */
-//	ddekit_do_initcalls();
-	/* 1000: pure_, core_ */
-	l4dde26_init ();
-	l4dde26_process_init ();
-	l4dde26_init_timers ();
-	net_ns_init ();
-	dde_page_cache_init ();
-	init_workqueues ();
-	chrdev_init ();
-	/* 1001: postcore_ */
-	pci_driver_init ();
-	pcibus_class_init ();
-	bdi_class_init ();
-	/* 1002: arch_ */
-	l4dde26_init_pci ();
-	/* 1003: subsys_ */
-	net_dev_init ();
-//	neigh_init ();
-	blk_ioc_init ();
-	blk_settings_init ();
-	blk_softirq_init ();
-//	genhd_device_init ();
-	noop_init ();
-	init_bio ();
-	/* 1004: fs_ */
-	pci_iommu_init ();
-	/* 1005: device_ */
-	pci_init ();
-	/* 1006: late_ */
+	ddekit_do_initcalls();
 }
 
-//dde_initcall(l4dde26_init);
+dde_initcall(l4dde26_init);
diff --git a/libdde_linux26/lib/src/arch/l4/local.h b/libdde_linux26/lib/src/arch/l4/local.h
index 275c745b..d834a9db 100644
--- a/libdde_linux26/lib/src/arch/l4/local.h
+++ b/libdde_linux26/lib/src/arch/l4/local.h
@@ -6,7 +6,7 @@
 #include <ddekit/assert.h>
 #include <ddekit/condvar.h>
 #include <ddekit/debug.h>
-//#include <ddekit/initcall.h>
+#include <ddekit/initcall.h>
 #include <ddekit/interrupt.h>
 #include <ddekit/lock.h>
 #include <ddekit/memory.h>
diff --git a/libdde_linux26/lib/src/arch/l4/page_alloc.c b/libdde_linux26/lib/src/arch/l4/page_alloc.c
index 7c4faa0e..e887bd51 100644
--- a/libdde_linux26/lib/src/arch/l4/page_alloc.c
+++ b/libdde_linux26/lib/src/arch/l4/page_alloc.c
@@ -264,7 +264,7 @@ void *__init alloc_large_system_hash(const char *tablename,
 }
 
 
-void __init dde_page_cache_init(void)
+static void __init dde_page_cache_init(void)
 {
 	printk("Initializing DDE page cache\n");
 	int i=0;
@@ -273,4 +273,4 @@ void __init dde_page_cache_init(void)
 		INIT_HLIST_HEAD(&dde_page_cache[i]);
 }
 
-//core_initcall(dde_page_cache_init);
+core_initcall(dde_page_cache_init);
diff --git a/libdde_linux26/lib/src/arch/l4/pci.c b/libdde_linux26/lib/src/arch/l4/pci.c
index e86c42e8..2a0391f2 100644
--- a/libdde_linux26/lib/src/arch/l4/pci.c
+++ b/libdde_linux26/lib/src/arch/l4/pci.c
@@ -186,4 +186,4 @@ void __init l4dde26_init_pci(void)
 	INITIALIZE_INITVAR(dde26_pci);
 }
 
-//arch_initcall(l4dde26_init_pci);
+arch_initcall(l4dde26_init_pci);
diff --git a/libdde_linux26/lib/src/arch/l4/timer.c b/libdde_linux26/lib/src/arch/l4/timer.c
index 8149fe7e..2b657ab4 100644
--- a/libdde_linux26/lib/src/arch/l4/timer.c
+++ b/libdde_linux26/lib/src/arch/l4/timer.c
@@ -154,7 +154,7 @@ void __init l4dde26_init_timers(void)
 	INITIALIZE_INITVAR(dde26_timer);
 }
 
-//core_initcall(l4dde26_init_timers);
+core_initcall(l4dde26_init_timers);
 
 __attribute__((weak)) void do_gettimeofday (struct timeval *tv)
 {