From 145623ebcf753252a36a3e67128fb9879d0001e4 Mon Sep 17 00:00:00 2001
From: Zheng Da <zhengda1936@gmail.com>
Date: Tue, 5 Jan 2010 16:51:25 +0100
Subject: call initcall functions explicitly.

---
 libdde_linux26/lib/src/arch/l4/init.c       | 48 +++++++++++++++++++++++++++--
 libdde_linux26/lib/src/arch/l4/local.h      |  2 +-
 libdde_linux26/lib/src/arch/l4/page_alloc.c |  2 +-
 libdde_linux26/lib/src/arch/l4/pci.c        |  2 +-
 libdde_linux26/lib/src/arch/l4/timer.c      |  2 +-
 5 files changed, 50 insertions(+), 6 deletions(-)

(limited to 'libdde_linux26/lib/src/arch')

diff --git a/libdde_linux26/lib/src/arch/l4/init.c b/libdde_linux26/lib/src/arch/l4/init.c
index 79112f78..1d44bf97 100644
--- a/libdde_linux26/lib/src/arch/l4/init.c
+++ b/libdde_linux26/lib/src/arch/l4/init.c
@@ -26,8 +26,52 @@ 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();
+//	ddekit_do_initcalls();
+	/* 1000: pure_, core_ */
+	l4dde26_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_ */
 }
 
-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 d834a9db..275c745b 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 e887bd51..a418cc65 100644
--- a/libdde_linux26/lib/src/arch/l4/page_alloc.c
+++ b/libdde_linux26/lib/src/arch/l4/page_alloc.c
@@ -273,4 +273,4 @@ static 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 2a0391f2..e86c42e8 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 ea04b67e..f80aa5d3 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);
 
 extern unsigned long volatile __jiffy_data jiffies;
 
-- 
cgit v1.2.3