diff options
| author | James Morris <jmorris@namei.org> | 2009-06-08 19:27:53 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-08 19:27:53 -0400 |
| commit | 0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch) | |
| tree | 1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /fs/sysfs/file.c | |
| parent | 04288f42033607099cebf5ca15ce8dcec3a9688b (diff) | |
| parent | 3af968e066d593bc4dacc021715f3e95ddf0996f (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'fs/sysfs/file.c')
| -rw-r--r-- | fs/sysfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index b1606e07b7a3..561a9c050cef 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c | |||
| @@ -723,7 +723,7 @@ int sysfs_schedule_callback(struct kobject *kobj, void (*func)(void *), | |||
| 723 | mutex_unlock(&sysfs_workq_mutex); | 723 | mutex_unlock(&sysfs_workq_mutex); |
| 724 | 724 | ||
| 725 | if (sysfs_workqueue == NULL) { | 725 | if (sysfs_workqueue == NULL) { |
| 726 | sysfs_workqueue = create_workqueue("sysfsd"); | 726 | sysfs_workqueue = create_singlethread_workqueue("sysfsd"); |
| 727 | if (sysfs_workqueue == NULL) { | 727 | if (sysfs_workqueue == NULL) { |
| 728 | module_put(owner); | 728 | module_put(owner); |
| 729 | return -ENOMEM; | 729 | return -ENOMEM; |