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 d59452c2e3c8d0f0f7759ba7489c0a18af2b7fbb..7b46c49d66bf26bcebd755b7bcbb61c2cc8528ee 100644 (file)
--- 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 6aa625b1010ae2cb16b8101477ee701ce38c245b..82b8579cc8993012d387513f3dadd331f870618f 100644 (file)
--- 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 966f4c1190fe64450aef2b8663b432078d99fe5a..a60313eba8d74fdafa63f3e8682998fd1dec2636 100644 (file)
--- 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 f48847c4f222ec881c681ca81f976b28f24ca676..e59938b57e5df9bfe67c42c849cec5bb10b39fcd 100644 (file)
--- 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 d6b5d42ec4ce2594f2ded1433e256ebc489ad0ed..1824019c2b0c549627ffe73410ef1d289c9d096a 100644 (file)
--- 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 919a24677eab3fa62441980d846517e50ed4889c..708c1fa450e4519919cb05d1fe35a77201e7e82b 100644 (file)
--- 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;