summaryrefslogtreecommitdiff
path: root/libdde_linux26/contrib/block
diff options
context:
space:
mode:
authorZheng Da <zhengda1936@gmail.com>2010-01-16 01:21:07 +0100
committerZheng Da <zhengda1936@gmail.com>2010-01-16 01:21:07 +0100
commit2680eecc499e43679be098e5834d4f3a62f59a0c (patch)
tree32771b7ae2f930a6f107f9c86d7de03f9622f03f /libdde_linux26/contrib/block
parent51299b970600d28df634708557f80df3526014ae (diff)
prepare to use initcall to do initialization.
Diffstat (limited to 'libdde_linux26/contrib/block')
-rw-r--r--libdde_linux26/contrib/block/blk-ioc.c4
-rw-r--r--libdde_linux26/contrib/block/blk-settings.c4
-rw-r--r--libdde_linux26/contrib/block/blk-softirq.c4
-rw-r--r--libdde_linux26/contrib/block/noop-iosched.c4
4 files changed, 8 insertions, 8 deletions
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);