From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 11 Dec 2009 08:47:19 +0000 (+0000)
Subject: blktap2: properly __init-annotate blktap2 code
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4181d8541ff8bdb747fd3929e8265c6d95d7a7c3;p=legacy%2Flinux-2.6.18-xen.git

blktap2: properly __init-annotate blktap2 code

Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/drivers/xen/blktap2/blktap.h b/drivers/xen/blktap2/blktap.h
index d59452c2..7b46c49d 100644
--- a/drivers/xen/blktap2/blktap.h
+++ b/drivers/xen/blktap2/blktap.h
@@ -4,6 +4,7 @@
 #include <linux/fs.h>
 #include <linux/poll.h>
 #include <linux/cdev.h>
+#include <linux/init.h>
 #include <linux/scatterlist.h>
 #include <xen/blkif.h>
 #include <xen/gnttab.h>
diff --git a/drivers/xen/blktap2/control.c b/drivers/xen/blktap2/control.c
index 6aa625b1..82b8579c 100644
--- a/drivers/xen/blktap2/control.c
+++ b/drivers/xen/blktap2/control.c
@@ -202,7 +202,7 @@ blktap_control_destroy_device(struct blktap *tap)
 	return err;
 }
 
-static int
+static int __init
 blktap_control_init(void)
 {
 	int err;
diff --git a/drivers/xen/blktap2/device.c b/drivers/xen/blktap2/device.c
index 966f4c11..a60313eb 100644
--- a/drivers/xen/blktap2/device.c
+++ b/drivers/xen/blktap2/device.c
@@ -1163,7 +1163,7 @@ blktap_device_create(struct blktap *tap)
 	return err;
 }
 
-int
+int __init
 blktap_device_init(int *maj)
 {
 	int major;
diff --git a/drivers/xen/blktap2/request.c b/drivers/xen/blktap2/request.c
index f48847c4..e59938b5 100644
--- a/drivers/xen/blktap2/request.c
+++ b/drivers/xen/blktap2/request.c
@@ -271,7 +271,7 @@ blktap_request_pool_free(void)
 	spin_unlock_irqrestore(&pool.lock, flags);
 }
 
-int
+int __init
 blktap_request_pool_init(void)
 {
 	int i, err;
diff --git a/drivers/xen/blktap2/ring.c b/drivers/xen/blktap2/ring.c
index d6b5d42e..1824019c 100644
--- a/drivers/xen/blktap2/ring.c
+++ b/drivers/xen/blktap2/ring.c
@@ -587,7 +587,7 @@ blktap_ring_create(struct blktap *tap)
 	return blktap_sysfs_create(tap);
 }
 
-int
+int __init
 blktap_ring_init(int *major)
 {
 	int err;
diff --git a/drivers/xen/blktap2/sysfs.c b/drivers/xen/blktap2/sysfs.c
index 919a2467..708c1fa4 100644
--- a/drivers/xen/blktap2/sysfs.c
+++ b/drivers/xen/blktap2/sysfs.c
@@ -405,7 +405,7 @@ blktap_sysfs_free(void)
 	class_destroy(class);
 }
 
-int
+int __init
 blktap_sysfs_init(void)
 {
 	struct class *cls;