prepare to use initcall to do initialization.

22 files changed, 39 insertions, 84 deletions

diff --git a/libdde_linux26/contrib/arch/x86/kernel/pci-dma.c b/libdde_linux26/contrib/arch/x86/kernel/pci-dma.c
index 3a26519b..b2542853 100644
--- a/libdde_linux26/contrib/arch/x86/kernel/pci-dma.c
+++ b/libdde_linux26/contrib/arch/x86/kernel/pci-dma.c
@@ -263,7 +263,7 @@ int dma_supported(struct device *dev, u64 mask)
 }
 EXPORT_SYMBOL(dma_supported);
 
-int __init pci_iommu_init(void)
+static int __init pci_iommu_init(void)
 {
 	calgary_iommu_init();
 
@@ -282,7 +282,7 @@ void pci_iommu_shutdown(void)
 	gart_iommu_shutdown();
 }
 /* Must execute after PCI subsystem */
-//fs_initcall(pci_iommu_init);
+fs_initcall(pci_iommu_init);
 
 #ifdef CONFIG_PCI
 /* Many VIA bridges seem to corrupt data for DAC. Disable it here */
diff --git a/libdde_linux26/contrib/block/blk-ioc.c b/libdde_linux26/contrib/block/blk-ioc.c
index b3292405..012f065a 100644
--- a/libdde_linux26/contrib/block/blk-ioc.c
+++ b/libdde_linux26/contrib/block/blk-ioc.c
@@ -171,10 +171,10 @@ void copy_io_context(struct io_context **pdst, struct io_context **psrc)
 }
 EXPORT_SYMBOL(copy_io_context);
 
-int __init blk_ioc_init(void)
+static int __init blk_ioc_init(void)
 {
 	iocontext_cachep = kmem_cache_create("blkdev_ioc",
 			sizeof(struct io_context), 0, SLAB_PANIC, NULL);
 	return 0;
 }
-//subsys_initcall(blk_ioc_init);
+subsys_initcall(blk_ioc_init);
diff --git a/libdde_linux26/contrib/block/blk-settings.c b/libdde_linux26/contrib/block/blk-settings.c
index 2178202f..59fd05d9 100644
--- a/libdde_linux26/contrib/block/blk-settings.c
+++ b/libdde_linux26/contrib/block/blk-settings.c
@@ -463,10 +463,10 @@ void blk_queue_update_dma_alignment(struct request_queue *q, int mask)
 }
 EXPORT_SYMBOL(blk_queue_update_dma_alignment);
 
-int __init blk_settings_init(void)
+static int __init blk_settings_init(void)
 {
 	blk_max_low_pfn = max_low_pfn - 1;
 	blk_max_pfn = max_pfn - 1;
 	return 0;
 }
-//subsys_initcall(blk_settings_init);
+subsys_initcall(blk_settings_init);
diff --git a/libdde_linux26/contrib/block/blk-softirq.c b/libdde_linux26/contrib/block/blk-softirq.c
index 34041d14..ce0efc6b 100644
--- a/libdde_linux26/contrib/block/blk-softirq.c
+++ b/libdde_linux26/contrib/block/blk-softirq.c
@@ -161,7 +161,7 @@ void blk_complete_request(struct request *req)
 }
 EXPORT_SYMBOL(blk_complete_request);
 
-__init int blk_softirq_init(void)
+static __init int blk_softirq_init(void)
 {
 	int i;
 
@@ -172,4 +172,4 @@ __init int blk_softirq_init(void)
 	register_hotcpu_notifier(&blk_cpu_notifier);
 	return 0;
 }
-//subsys_initcall(blk_softirq_init);
+subsys_initcall(blk_softirq_init);
diff --git a/libdde_linux26/contrib/block/noop-iosched.c b/libdde_linux26/contrib/block/noop-iosched.c
index a7618fdb..075cb108 100644
--- a/libdde_linux26/contrib/block/noop-iosched.c
+++ b/libdde_linux26/contrib/block/noop-iosched.c
@@ -101,7 +101,7 @@ static struct elevator_type elevator_noop = {
 	.elevator_owner = THIS_MODULE,
 };
 
-int __init noop_init(void)
+static int __init noop_init(void)
 {
 	DEBUG_MSG("here!");
 	elv_register(&elevator_noop);
@@ -114,7 +114,7 @@ static void __exit noop_exit(void)
 	elv_unregister(&elevator_noop);
 }
 
-//subsys_initcall(noop_init);
+subsys_initcall(noop_init);
 module_exit(noop_exit);
 
 
diff --git a/libdde_linux26/contrib/fs/bio.c b/libdde_linux26/contrib/fs/bio.c
index 7e0238b8..d4f06327 100644
--- a/libdde_linux26/contrib/fs/bio.c
+++ b/libdde_linux26/contrib/fs/bio.c
@@ -1592,7 +1592,7 @@ static void __init biovec_init_slabs(void)
 	}
 }
 
-int __init init_bio(void)
+static int __init init_bio(void)
 {
 	bio_slab_max = 2;
 	bio_slab_nr = 0;
@@ -1615,7 +1615,7 @@ int __init init_bio(void)
 	return 0;
 }
 
-//subsys_initcall(init_bio);
+subsys_initcall(init_bio);
 
 EXPORT_SYMBOL(bio_alloc);
 EXPORT_SYMBOL(bio_kmalloc);
diff --git a/libdde_linux26/contrib/mm/backing-dev.c b/libdde_linux26/contrib/mm/backing-dev.c
index 25ebba9a..8e858744 100644
--- a/libdde_linux26/contrib/mm/backing-dev.c
+++ b/libdde_linux26/contrib/mm/backing-dev.c
@@ -159,7 +159,7 @@ static struct device_attribute bdi_dev_attrs[] = {
 	__ATTR_NULL,
 };
 
-__init int bdi_class_init(void)
+static __init int bdi_class_init(void)
 {
 	bdi_class = class_create(THIS_MODULE, "bdi");
 	bdi_class->dev_attrs = bdi_dev_attrs;
@@ -167,7 +167,7 @@ __init int bdi_class_init(void)
 	return 0;
 }
 
-//postcore_initcall(bdi_class_init);
+postcore_initcall(bdi_class_init);
 
 int bdi_register(struct backing_dev_info *bdi, struct device *parent,
 		const char *fmt, ...)
diff --git a/libdde_linux26/contrib/net/core/neighbour.c b/libdde_linux26/contrib/net/core/neighbour.c
index 97ed0aee..e0a03c81 100644
--- a/libdde_linux26/contrib/net/core/neighbour.c
+++ b/libdde_linux26/contrib/net/core/neighbour.c
@@ -2810,7 +2810,7 @@ EXPORT_SYMBOL(neigh_sysctl_unregister);
 
 #endif	/* CONFIG_SYSCTL */
 
-int __init neigh_init(void)
+static int __init neigh_init(void)
 {
 	rtnl_register(PF_UNSPEC, RTM_NEWNEIGH, neigh_add, NULL);
 	rtnl_register(PF_UNSPEC, RTM_DELNEIGH, neigh_delete, NULL);
@@ -2822,5 +2822,5 @@ int __init neigh_init(void)
 	return 0;
 }
 
-//subsys_initcall(neigh_init);
+subsys_initcall(neigh_init);
 
diff --git a/libdde_linux26/include/linux/init.h b/libdde_linux26/include/linux/init.h
index c7138b66..770546a2 100644
--- a/libdde_linux26/include/linux/init.h
+++ b/libdde_linux26/include/linux/init.h
@@ -2,7 +2,7 @@
 #define _LINUX_INIT_H
 
 #ifdef DDE_LINUX
-//#include <ddekit/initcall.h>
+#include <ddekit/initcall.h>
 #endif
 #include <linux/compiler.h>
 
@@ -184,7 +184,7 @@ extern void (*late_time_init)(void);
 #else // DDE_LINUX
 // XXX: DDE CTORs are executed in reverse order as was done by
 //      Linux' initcalls in earlier versions
-//#include <l4/dde/ddekit/initcall.h>
+#include <ddekit/initcall.h>
 #define __define_initcall(level,fn,id) DDEKIT_CTOR(fn,level)
 #endif
 
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)
 {
diff --git a/libdde_linux26/lib/src/block/genhd.c b/libdde_linux26/lib/src/block/genhd.c
index f9a205f5..921cebff 100644
--- a/libdde_linux26/lib/src/block/genhd.c
+++ b/libdde_linux26/lib/src/block/genhd.c
@@ -792,7 +792,7 @@ static struct kobject *base_probe(dev_t devt, int *partno, void *data)
 	return NULL;
 }
 
-int __init genhd_device_init(void)
+static int __init genhd_device_init(void)
 {
 	int error;
 
@@ -812,7 +812,7 @@ int __init genhd_device_init(void)
 	return 0;
 }
 
-//subsys_initcall(genhd_device_init);
+subsys_initcall(genhd_device_init);
 
 static ssize_t disk_range_show(struct device *dev,
 			       struct device_attribute *attr, char *buf)
diff --git a/libdde_linux26/lib/src/drivers/pci/pci-driver.c b/libdde_linux26/lib/src/drivers/pci/pci-driver.c
index 591d9489..199ec8a7 100644
--- a/libdde_linux26/lib/src/drivers/pci/pci-driver.c
+++ b/libdde_linux26/lib/src/drivers/pci/pci-driver.c
@@ -992,12 +992,12 @@ struct bus_type pci_bus_type = {
 	.pm		= PCI_PM_OPS_PTR,
 };
 
-int __init pci_driver_init(void)
+static int __init pci_driver_init(void)
 {
 	return bus_register(&pci_bus_type);
 }
 
-//postcore_initcall(pci_driver_init);
+postcore_initcall(pci_driver_init);
 
 EXPORT_SYMBOL(pci_match_id);
 EXPORT_SYMBOL(__pci_register_driver);
diff --git a/libdde_linux26/lib/src/drivers/pci/pci.c b/libdde_linux26/lib/src/drivers/pci/pci.c
index 9bf601c3..f67bf734 100644
--- a/libdde_linux26/lib/src/drivers/pci/pci.c
+++ b/libdde_linux26/lib/src/drivers/pci/pci.c
@@ -2404,7 +2404,7 @@ int __devinit pci_init(void)
 	return 0;
 }
 
-int __init pci_setup(char *str)
+static int __init pci_setup(char *str)
 {
 #ifndef DDE_LINUX
 	while (str) {
@@ -2434,7 +2434,7 @@ int __init pci_setup(char *str)
 }
 early_param("pci", pci_setup);
 
-//device_initcall(pci_init);
+device_initcall(pci_init);
 
 EXPORT_SYMBOL(pci_reenable_device);
 EXPORT_SYMBOL(pci_enable_device_io);
diff --git a/libdde_linux26/lib/src/drivers/pci/probe.c b/libdde_linux26/lib/src/drivers/pci/probe.c
index 9cbc3bfb..32da5108 100644
--- a/libdde_linux26/lib/src/drivers/pci/probe.c
+++ b/libdde_linux26/lib/src/drivers/pci/probe.c
@@ -100,11 +100,11 @@ static struct class pcibus_class = {
 	.dev_release	= &release_pcibus_dev,
 };
 
-int __init pcibus_class_init(void)
+static int __init pcibus_class_init(void)
 {
 	return class_register(&pcibus_class);
 }
-//postcore_initcall(pcibus_class_init);
+postcore_initcall(pcibus_class_init);
 
 /*
  * Translate the low bits of the PCI base
diff --git a/libdde_linux26/lib/src/fs/char_dev.c b/libdde_linux26/lib/src/fs/char_dev.c
index 9dd832b4..3b8e8b3d 100644
--- a/libdde_linux26/lib/src/fs/char_dev.c
+++ b/libdde_linux26/lib/src/fs/char_dev.c
@@ -556,7 +556,7 @@ void __init chrdev_init(void)
 }
 
 #ifndef LIBINPUT
-//core_initcall(chrdev_init);
+core_initcall(chrdev_init);
 #endif
 
 /* Let modules do char dev stuff */
diff --git a/libdde_linux26/lib/src/kernel/workqueue.c b/libdde_linux26/lib/src/kernel/workqueue.c
index d52b22b5..5ad26d9f 100644
--- a/libdde_linux26/lib/src/kernel/workqueue.c
+++ b/libdde_linux26/lib/src/kernel/workqueue.c
@@ -1034,5 +1034,5 @@ void __init init_workqueues(void)
 }
 
 #ifdef DDE_LINUX
-//core_initcall(init_workqueues);
+core_initcall(init_workqueues);
 #endif
diff --git a/libdde_linux26/lib/src/net/core/dev.c b/libdde_linux26/lib/src/net/core/dev.c
index b1307dd2..65b4ba42 100644
--- a/libdde_linux26/lib/src/net/core/dev.c
+++ b/libdde_linux26/lib/src/net/core/dev.c
@@ -5186,7 +5186,7 @@ static struct pernet_operations __net_initdata default_device_ops = {
  *       This is called single threaded during boot, so no need
  *       to take the rtnl semaphore.
  */
-int __init net_dev_init(void)
+static int __init net_dev_init(void)
 {
 	int i, rc = -ENOMEM;
 
@@ -5254,7 +5254,7 @@ out:
 	return rc;
 }
 
-//subsys_initcall(net_dev_init);
+subsys_initcall(net_dev_init);
 
 EXPORT_SYMBOL(__dev_get_by_index);
 EXPORT_SYMBOL(__dev_get_by_name);
diff --git a/libdde_linux26/lib/src/net/core/net_namespace.c b/libdde_linux26/lib/src/net/core/net_namespace.c
index 29f29621..ab5a0a7f 100644
--- a/libdde_linux26/lib/src/net/core/net_namespace.c
+++ b/libdde_linux26/lib/src/net/core/net_namespace.c
@@ -202,7 +202,7 @@ struct net *copy_net_ns(unsigned long flags, struct net *old_net)
 }
 #endif
 
-int __init net_ns_init(void)
+static int __init net_ns_init(void)
 {
 	struct net_generic *ng;
 	int err;
@@ -239,7 +239,7 @@ int __init net_ns_init(void)
 	return 0;
 }
 
-//pure_initcall(net_ns_init);
+pure_initcall(net_ns_init);
 
 #ifdef CONFIG_NET_NS
 static int register_pernet_operations(struct list_head *list,