From 2489007e7d740ccbc3e0a202914e243ad5178787 Mon Sep 17 00:00:00 2001
From: codeworkx <codeworkx@cyanogenmod.com>
Date: Sat, 22 Sep 2012 09:48:20 +0200
Subject: merge opensource jb u5

Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
---
 block/blk-cgroup.c       | 5 ++++-
 block/blk-ioc.c          | 4 ++++
 block/blk-settings.c     | 4 ++++
 block/cfq-iosched.c      | 5 +++++
 block/deadline-iosched.c | 4 ++++
 block/genhd.c            | 4 ++++
 block/noop-iosched.c     | 4 ++++
 7 files changed, 29 insertions(+), 1 deletion(-)

(limited to 'block')

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index b596e54..345843f 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1660,7 +1660,10 @@ static void __exit exit_cgroup_blkio(void)
 {
 	cgroup_unload_subsys(&blkio_subsys);
 }
-
+#ifdef CONFIG_FAST_RESUME
+beforeresume_initcall(init_cgroup_blkio);
+#else
 module_init(init_cgroup_blkio);
+#endif
 module_exit(exit_cgroup_blkio);
 MODULE_LICENSE("GPL");
diff --git a/block/blk-ioc.c b/block/blk-ioc.c
index 342eae9..9be30fe 100644
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
@@ -161,4 +161,8 @@ static int __init blk_ioc_init(void)
 			sizeof(struct io_context), 0, SLAB_PANIC, NULL);
 	return 0;
 }
+#ifdef CONFIG_FAST_RESUME
+beforeresume_initcall(blk_ioc_init);
+#else
 subsys_initcall(blk_ioc_init);
+#endif
diff --git a/block/blk-settings.c b/block/blk-settings.c
index fa1eb04..dfd0270 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -803,4 +803,8 @@ static int __init blk_settings_init(void)
 	blk_max_pfn = max_pfn - 1;
 	return 0;
 }
+#ifdef CONFIG_FAST_RESUME
+beforeresume_initcall(blk_settings_init);
+#else
 subsys_initcall(blk_settings_init);
+#endif
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 23500ac..bfe3bbe 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -2060,6 +2060,7 @@ static void cfq_dispatch_insert(struct request_queue *q, struct request *rq)
 	cfq_remove_request(rq);
 	cfqq->dispatched++;
 	(RQ_CFQG(rq))->dispatched++;
+	rq->ioprio = IOPRIO_PRIO_VALUE(cfqq->ioprio_class, cfqq->ioprio);
 	elv_dispatch_sort(q, rq);
 
 	cfqd->rq_in_flight[cfq_cfqq_sync(cfqq)]++;
@@ -4289,7 +4290,11 @@ static void __exit cfq_exit(void)
 	cfq_slab_kill();
 }
 
+#ifdef CONFIG_FAST_RESUME
+beforeresume_initcall(cfq_init);
+#else
 module_init(cfq_init);
+#endif
 module_exit(cfq_exit);
 
 MODULE_AUTHOR("Jens Axboe");
diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c
index 5139c0e..301a779 100644
--- a/block/deadline-iosched.c
+++ b/block/deadline-iosched.c
@@ -460,7 +460,11 @@ static void __exit deadline_exit(void)
 	elv_unregister(&iosched_deadline);
 }
 
+#ifdef CONFIG_FAST_RESUME
+beforeresume_initcall(deadline_init);
+#else
 module_init(deadline_init);
+#endif
 module_exit(deadline_exit);
 
 MODULE_AUTHOR("Jens Axboe");
diff --git a/block/genhd.c b/block/genhd.c
index b301fad..de7fc3e 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -916,7 +916,11 @@ static int __init genhd_device_init(void)
 	return 0;
 }
 
+#ifdef CONFIG_FAST_RESUME
+beforeresume_initcall(genhd_device_init);
+#else
 subsys_initcall(genhd_device_init);
+#endif
 
 static ssize_t disk_range_show(struct device *dev,
 			       struct device_attribute *attr, char *buf)
diff --git a/block/noop-iosched.c b/block/noop-iosched.c
index 06389e9..18f8bdd 100644
--- a/block/noop-iosched.c
+++ b/block/noop-iosched.c
@@ -104,7 +104,11 @@ static void __exit noop_exit(void)
 	elv_unregister(&elevator_noop);
 }
 
+#ifdef CONFIG_FAST_RESUME
+beforeresume_initcall(noop_init);
+#else
 module_init(noop_init);
+#endif
 module_exit(noop_exit);
 
 
-- 
cgit v1.1