# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1260521239 0
# Node ID 6b5c16a30bc5e7d771dec05c7cee597b71a695c2
# Parent 72b77ff2d5229f9dc14bbaff6fcdec943da59415
blktap2: properly __init-annotate blktap2 code
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
diff -r 72b77ff2d522 -r 6b5c16a30bc5 drivers/xen/blktap/blktap.h
--- a/drivers/xen/blktap/blktap.h Mon Jul 20 10:03:44 2009 +0100
+++ b/drivers/xen/blktap/blktap.h Fri Dec 11 08:47:19 2009 +0000
@@ -4,6 +4,7 @@
 #include <linux/mm.h>
 #include <linux/fs.h>
 #include <linux/cdev.h>
+#include <linux/init.h>
 #include <linux/scatterlist.h>
 #include <xen/blkif.h>
 #include <xen/grant_table.h>
diff -r 72b77ff2d522 -r 6b5c16a30bc5 drivers/xen/blktap/control.c
--- a/drivers/xen/blktap/control.c Mon Jul 20 10:03:44 2009 +0100
+++ b/drivers/xen/blktap/control.c Fri Dec 11 08:47:19 2009 +0000
@@ -205,7 +205,7 @@
 return err;
 }
 
-static int
+static int __init
 blktap_control_init(void)
 {
 int err;
diff -r 72b77ff2d522 -r 6b5c16a30bc5 drivers/xen/blktap/device.c
--- a/drivers/xen/blktap/device.c Mon Jul 20 10:03:44 2009 +0100
+++ b/drivers/xen/blktap/device.c Fri Dec 11 08:47:19 2009 +0000
@@ -1112,7 +1112,7 @@
 return err;
 }
 
-int
+int __init
 blktap_device_init(int *maj)
 {
 int major;
diff -r 72b77ff2d522 -r 6b5c16a30bc5 drivers/xen/blktap/request.c
--- a/drivers/xen/blktap/request.c Mon Jul 20 10:03:44 2009 +0100
+++ b/drivers/xen/blktap/request.c Fri Dec 11 08:47:19 2009 +0000
@@ -272,7 +272,7 @@
 spin_unlock_irqrestore(&pool.lock, flags);
 }
 
-int
+int __init
 blktap_request_pool_init(void)
 {
 int i, err;
diff -r 72b77ff2d522 -r 6b5c16a30bc5 drivers/xen/blktap/ring.c
--- a/drivers/xen/blktap/ring.c Mon Jul 20 10:03:44 2009 +0100
+++ b/drivers/xen/blktap/ring.c Fri Dec 11 08:47:19 2009 +0000
@@ -589,7 +589,7 @@
 return blktap_sysfs_create(tap);
 }
 
-int
+int __init
 blktap_ring_init(int *major)
 {
 int err;
diff -r 72b77ff2d522 -r 6b5c16a30bc5 drivers/xen/blktap/sysfs.c
--- a/drivers/xen/blktap/sysfs.c Mon Jul 20 10:03:44 2009 +0100
+++ b/drivers/xen/blktap/sysfs.c Fri Dec 11 08:47:19 2009 +0000
@@ -424,7 +424,7 @@
 class_destroy(class);
 }
 
-int
+int __init
 blktap_sysfs_init(void)
 {
 struct class *cls;
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel