Subject: properly __init-annotate blktap2 code

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

--- head-2009-12-07.orig/drivers/xen/blktap2/blktap.h	2009-11-03 10:35:24.000000000 +0100
+++ head-2009-12-07/drivers/xen/blktap2/blktap.h	2009-12-09 16:16:17.000000000 +0100
@@ -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>
--- head-2009-12-07.orig/drivers/xen/blktap2/control.c	2009-11-06 10:51:17.000000000 +0100
+++ head-2009-12-07/drivers/xen/blktap2/control.c	2009-12-09 16:17:13.000000000 +0100
@@ -203,7 +203,7 @@ blktap_control_destroy_device(struct blk
 	return err;
 }
 
-static int
+static int __init
 blktap_control_init(void)
 {
 	int err;
--- head-2009-12-07.orig/drivers/xen/blktap2/device.c	2009-11-03 10:45:45.000000000 +0100
+++ head-2009-12-07/drivers/xen/blktap2/device.c	2009-12-09 16:17:32.000000000 +0100
@@ -1162,7 +1162,7 @@ blktap_device_create(struct blktap *tap)
 	return err;
 }
 
-int
+int __init
 blktap_device_init(int *maj)
 {
 	int major;
--- head-2009-12-07.orig/drivers/xen/blktap2/request.c	2009-05-29 10:25:53.000000000 +0200
+++ head-2009-12-07/drivers/xen/blktap2/request.c	2009-12-09 16:17:42.000000000 +0100
@@ -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;
--- head-2009-12-07.orig/drivers/xen/blktap2/ring.c	2009-11-06 10:51:32.000000000 +0100
+++ head-2009-12-07/drivers/xen/blktap2/ring.c	2009-12-09 16:18:02.000000000 +0100
@@ -586,7 +586,7 @@ blktap_ring_create(struct blktap *tap)
 	return blktap_sysfs_create(tap);
 }
 
-int
+int __init
 blktap_ring_init(int *major)
 {
 	int err;
--- head-2009-12-07.orig/drivers/xen/blktap2/sysfs.c	2009-12-09 16:14:04.000000000 +0100
+++ head-2009-12-07/drivers/xen/blktap2/sysfs.c	2009-12-09 16:18:15.000000000 +0100
@@ -435,7 +435,7 @@ blktap_sysfs_free(void)
 	class_destroy(class);
 }
 
-int
+int __init
 blktap_sysfs_init(void)
 {
 	struct class *cls;