diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-08 15:12:28 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-08 15:12:28 -0700 |
| commit | 886aa559b9da994df968a7f2ddfd37f626d70436 (patch) | |
| tree | 88a39ebfdedd0a1c65e4c2d3c5952c9836c4157b /f4.patch | |
| parent | e41c242f0b8431b0f81d9ed6195e83c2e7e15a5e (diff) | |
| download | patches-886aa559b9da994df968a7f2ddfd37f626d70436.tar.gz | |
reorder some driver core patches
Diffstat (limited to 'f4.patch')
| -rw-r--r-- | f4.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/f4.patch b/f4.patch index 371e5f07871331..1aef34afa81642 100644 --- a/f4.patch +++ b/f4.patch @@ -221,7 +221,7 @@ static void pmu_dev_release(struct device *dev) --- a/kernel/workqueue.c +++ b/kernel/workqueue.c -@@ -3081,25 +3081,26 @@ static struct workqueue_struct *dev_to_w +@@ -3086,25 +3086,26 @@ static struct workqueue_struct *dev_to_w return wq_dev->wq; } @@ -255,7 +255,7 @@ { struct workqueue_struct *wq = dev_to_wq(dev); int val; -@@ -3110,12 +3111,14 @@ static ssize_t wq_max_active_store(struc +@@ -3115,12 +3116,14 @@ static ssize_t wq_max_active_store(struc workqueue_set_max_active(wq, val); return count; } @@ -274,7 +274,7 @@ static ssize_t wq_pool_ids_show(struct device *dev, struct device_attribute *attr, char *buf) -@@ -3265,7 +3268,7 @@ static struct device_attribute wq_sysfs_ +@@ -3270,7 +3273,7 @@ static struct device_attribute wq_sysfs_ static struct bus_type wq_subsys = { .name = "workqueue", |