[Xen-changelog] [linux-2.6.18-xen] blktap2: properly __init-annotate blktap2 code

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1260521239 0
# Node ID 5e08fff8dc05977d802d0aa2b71f010e473ca085
# Parent  1a97bd686258aabf7f57844dc77a00e0040ddab9
blktap2: properly __init-annotate blktap2 code

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 drivers/xen/blktap2/blktap.h  |    1 +
 drivers/xen/blktap2/control.c |    2 +-
 drivers/xen/blktap2/device.c  |    2 +-
 drivers/xen/blktap2/request.c |    2 +-
 drivers/xen/blktap2/ring.c    |    2 +-
 drivers/xen/blktap2/sysfs.c   |    2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff -r 1a97bd686258 -r 5e08fff8dc05 drivers/xen/blktap2/blktap.h
--- a/drivers/xen/blktap2/blktap.h      Mon Dec 07 14:14:28 2009 +0000
+++ b/drivers/xen/blktap2/blktap.h      Fri Dec 11 08:47:19 2009 +0000
@@ -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 -r 1a97bd686258 -r 5e08fff8dc05 drivers/xen/blktap2/control.c
--- a/drivers/xen/blktap2/control.c     Mon Dec 07 14:14:28 2009 +0000
+++ b/drivers/xen/blktap2/control.c     Fri Dec 11 08:47:19 2009 +0000
@@ -202,7 +202,7 @@ blktap_control_destroy_device(struct blk
        return err;
 }
 
-static int
+static int __init
 blktap_control_init(void)
 {
        int err;
diff -r 1a97bd686258 -r 5e08fff8dc05 drivers/xen/blktap2/device.c
--- a/drivers/xen/blktap2/device.c      Mon Dec 07 14:14:28 2009 +0000
+++ b/drivers/xen/blktap2/device.c      Fri Dec 11 08:47:19 2009 +0000
@@ -1163,7 +1163,7 @@ blktap_device_create(struct blktap *tap)
        return err;
 }
 
-int
+int __init
 blktap_device_init(int *maj)
 {
        int major;
diff -r 1a97bd686258 -r 5e08fff8dc05 drivers/xen/blktap2/request.c
--- a/drivers/xen/blktap2/request.c     Mon Dec 07 14:14:28 2009 +0000
+++ b/drivers/xen/blktap2/request.c     Fri Dec 11 08:47:19 2009 +0000
@@ -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 -r 1a97bd686258 -r 5e08fff8dc05 drivers/xen/blktap2/ring.c
--- a/drivers/xen/blktap2/ring.c        Mon Dec 07 14:14:28 2009 +0000
+++ b/drivers/xen/blktap2/ring.c        Fri Dec 11 08:47:19 2009 +0000
@@ -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 -r 1a97bd686258 -r 5e08fff8dc05 drivers/xen/blktap2/sysfs.c
--- a/drivers/xen/blktap2/sysfs.c       Mon Dec 07 14:14:28 2009 +0000
+++ b/drivers/xen/blktap2/sysfs.c       Fri Dec 11 08:47:19 2009 +0000
@@ -405,7 +405,7 @@ blktap_sysfs_free(void)
        class_destroy(class);
 }
 
-int
+int __init
 blktap_sysfs_init(void)
 {
        struct class *cls;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog