diff options
author | Tejun Heo <tj@kernel.org> | 2010-06-29 04:07:09 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2010-06-29 04:07:09 -0400 |
commit | c790bce0481857412c964c5e9d46d56e41c4b051 (patch) | |
tree | 82e87167b78bbf3456a53d057b1b741c250a0b76 /kernel | |
parent | 8fec62b2d9d0c80b594d0d85678bfdf57a70df1b (diff) |
workqueue: kill RT workqueue
With stop_machine() converted to use cpu_stop, RT workqueue doesn't
have any user left. Kill RT workqueue support.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/workqueue.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 327d2deb4451..1a47fbf92fae 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c | |||
@@ -62,7 +62,6 @@ struct workqueue_struct { | |||
62 | const char *name; | 62 | const char *name; |
63 | int singlethread; | 63 | int singlethread; |
64 | int freezeable; /* Freeze threads during suspend */ | 64 | int freezeable; /* Freeze threads during suspend */ |
65 | int rt; | ||
66 | #ifdef CONFIG_LOCKDEP | 65 | #ifdef CONFIG_LOCKDEP |
67 | struct lockdep_map lockdep_map; | 66 | struct lockdep_map lockdep_map; |
68 | #endif | 67 | #endif |
@@ -947,7 +946,6 @@ init_cpu_workqueue(struct workqueue_struct *wq, int cpu) | |||
947 | 946 | ||
948 | static int create_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu) | 947 | static int create_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu) |
949 | { | 948 | { |
950 | struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 }; | ||
951 | struct workqueue_struct *wq = cwq->wq; | 949 | struct workqueue_struct *wq = cwq->wq; |
952 | const char *fmt = is_wq_single_threaded(wq) ? "%s" : "%s/%d"; | 950 | const char *fmt = is_wq_single_threaded(wq) ? "%s" : "%s/%d"; |
953 | struct task_struct *p; | 951 | struct task_struct *p; |
@@ -963,8 +961,6 @@ static int create_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu) | |||
963 | */ | 961 | */ |
964 | if (IS_ERR(p)) | 962 | if (IS_ERR(p)) |
965 | return PTR_ERR(p); | 963 | return PTR_ERR(p); |
966 | if (cwq->wq->rt) | ||
967 | sched_setscheduler_nocheck(p, SCHED_FIFO, ¶m); | ||
968 | cwq->thread = p; | 964 | cwq->thread = p; |
969 | 965 | ||
970 | trace_workqueue_creation(cwq->thread, cpu); | 966 | trace_workqueue_creation(cwq->thread, cpu); |
@@ -986,7 +982,6 @@ static void start_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu) | |||
986 | struct workqueue_struct *__create_workqueue_key(const char *name, | 982 | struct workqueue_struct *__create_workqueue_key(const char *name, |
987 | int singlethread, | 983 | int singlethread, |
988 | int freezeable, | 984 | int freezeable, |
989 | int rt, | ||
990 | struct lock_class_key *key, | 985 | struct lock_class_key *key, |
991 | const char *lock_name) | 986 | const char *lock_name) |
992 | { | 987 | { |
@@ -1008,7 +1003,6 @@ struct workqueue_struct *__create_workqueue_key(const char *name, | |||
1008 | lockdep_init_map(&wq->lockdep_map, lock_name, key, 0); | 1003 | lockdep_init_map(&wq->lockdep_map, lock_name, key, 0); |
1009 | wq->singlethread = singlethread; | 1004 | wq->singlethread = singlethread; |
1010 | wq->freezeable = freezeable; | 1005 | wq->freezeable = freezeable; |
1011 | wq->rt = rt; | ||
1012 | INIT_LIST_HEAD(&wq->list); | 1006 | INIT_LIST_HEAD(&wq->list); |
1013 | 1007 | ||
1014 | if (singlethread) { | 1008 | if (singlethread) { |