summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-06-06 15:52:50 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-06-06 15:52:50 -0700
commitc6c284cdef73050a60b570e42a7e8f3aa71c17cc (patch)
tree0c74f6005fa5edb46d8ac0974fd37472d04c59b5
parent1ae92e7304856fa3aa8baf8acc9e73378a80f72a (diff)
downloadstable-queue-c6c284cdef73050a60b570e42a7e8f3aa71c17cc.tar.gz
.39 patches
-rw-r--r--queue-2.6.39/block-export-blk_-get-put-_queue.patch37
-rw-r--r--queue-2.6.39/series1
2 files changed, 38 insertions, 0 deletions
diff --git a/queue-2.6.39/block-export-blk_-get-put-_queue.patch b/queue-2.6.39/block-export-blk_-get-put-_queue.patch
new file mode 100644
index 0000000000..c192ffe372
--- /dev/null
+++ b/queue-2.6.39/block-export-blk_-get-put-_queue.patch
@@ -0,0 +1,37 @@
+From d86e0e83b32bc84600adb0b6ea1fce389b266682 Mon Sep 17 00:00:00 2001
+From: Jens Axboe <jaxboe@fusionio.com>
+Date: Fri, 27 May 2011 07:44:43 +0200
+Subject: block: export blk_{get,put}_queue()
+
+From: Jens Axboe <jaxboe@fusionio.com>
+
+commit d86e0e83b32bc84600adb0b6ea1fce389b266682 upstream.
+
+We need them in SCSI to fix a bug, but currently they are not
+exported to modules. Export them.
+
+Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ block/blk-core.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/block/blk-core.c
++++ b/block/blk-core.c
+@@ -345,6 +345,7 @@ void blk_put_queue(struct request_queue
+ {
+ kobject_put(&q->kobj);
+ }
++EXPORT_SYMBOL(blk_put_queue);
+
+ /*
+ * Note: If a driver supplied the queue lock, it should not zap that lock
+@@ -566,6 +567,7 @@ int blk_get_queue(struct request_queue *
+
+ return 1;
+ }
++EXPORT_SYMBOL(blk_get_queue);
+
+ static inline void blk_free_request(struct request_queue *q, struct request *rq)
+ {
diff --git a/queue-2.6.39/series b/queue-2.6.39/series
index 090fd70685..647dffc783 100644
--- a/queue-2.6.39/series
+++ b/queue-2.6.39/series
@@ -30,3 +30,4 @@ pci-set-pcie-maxpayload-for-card-during-hotplug-insertion.patch
powerpc-fix-32-bit-smp-build.patch
asus-wmi-remove-__init-from-asus_wmi_platform_init.patch
nl80211-fix-check-for-valid-ssid-size-in-scan-operations.patch
+block-export-blk_-get-put-_queue.patch