iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workqueue: kill RT workqueue

Browse Source 
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>
This commit is contained in:
Tejun Heo 2010-06-29 10:07:09 +02:00
parent 8fec62b2d9
commit c790bce048
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/linux/workqueue.h
View File

@ -181,12 +181,11 @@ static inline void destroy_work_on_stack(struct work_struct *work) { }
extern struct workqueue_struct * extern struct workqueue_struct *
__create_workqueue_key(const char *name, int singlethread, __create_workqueue_key(const char *name, int singlethread, int freezeable,
int freezeable, int rt, struct lock_class_key *key, struct lock_class_key *key, const char *lock_name);
const char *lock_name);
#ifdef CONFIG_LOCKDEP #ifdef CONFIG_LOCKDEP
#define __create_workqueue(name, singlethread, freezeable, rt) \ #define __create_workqueue(name, singlethread, freezeable) \
({ \ ({ \
static struct lock_class_key __key; \ static struct lock_class_key __key; \
const char *__lock_name; \ const char *__lock_name; \
@ -197,19 +196,18 @@ __create_workqueue_key(const char *name, int singlethread,
__lock_name = #name; \ __lock_name = #name; \
\ \
__create_workqueue_key((name), (singlethread), \ __create_workqueue_key((name), (singlethread), \
(freezeable), (rt), &__key, \ (freezeable), &__key, \
__lock_name); \ __lock_name); \
}) })
#else #else
#define __create_workqueue(name, singlethread, freezeable, rt) \ #define __create_workqueue(name, singlethread, freezeable) \
__create_workqueue_key((name), (singlethread), (freezeable), (rt), \ __create_workqueue_key((name), (singlethread), (freezeable), \
NULL, NULL) NULL, NULL)
#endif #endif
#define create_workqueue(name) __create_workqueue((name), 0, 0, 0) #define create_workqueue(name) __create_workqueue((name), 0, 0)
#define create_rt_workqueue(name) __create_workqueue((name), 0, 0, 1) #define create_freezeable_workqueue(name) __create_workqueue((name), 1, 1)
#define create_freezeable_workqueue(name) __create_workqueue((name), 1, 1, 0) #define create_singlethread_workqueue(name) __create_workqueue((name), 1, 0)
#define create_singlethread_workqueue(name) __create_workqueue((name), 1, 0, 0)
extern void destroy_workqueue(struct workqueue_struct *wq); extern void destroy_workqueue(struct workqueue_struct *wq);

6
kernel/workqueue.c
View File

@ -62,7 +62,6 @@ struct workqueue_struct {
const char *name; const char *name;
int singlethread; int singlethread;
int freezeable; /* Freeze threads during suspend */ int freezeable; /* Freeze threads during suspend */
int rt;
#ifdef CONFIG_LOCKDEP #ifdef CONFIG_LOCKDEP
struct lockdep_map lockdep_map; struct lockdep_map lockdep_map;
#endif #endif
@ -947,7 +946,6 @@ init_cpu_workqueue(struct workqueue_struct *wq, int cpu)
static int create_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu) static int create_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu)
{ {
struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
struct workqueue_struct *wq = cwq->wq; struct workqueue_struct *wq = cwq->wq;
const char *fmt = is_wq_single_threaded(wq) ? "%s" : "%s/%d"; const char *fmt = is_wq_single_threaded(wq) ? "%s" : "%s/%d";
struct task_struct *p; struct task_struct *p;
@ -963,8 +961,6 @@ static int create_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu)
*/ */
if (IS_ERR(p)) if (IS_ERR(p))
return PTR_ERR(p); return PTR_ERR(p);
if (cwq->wq->rt)
sched_setscheduler_nocheck(p, SCHED_FIFO, &param);
cwq->thread = p; cwq->thread = p;
trace_workqueue_creation(cwq->thread, cpu); trace_workqueue_creation(cwq->thread, cpu);
@ -986,7 +982,6 @@ static void start_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu)
struct workqueue_struct *__create_workqueue_key(const char *name, struct workqueue_struct *__create_workqueue_key(const char *name,
int singlethread, int singlethread,
int freezeable, int freezeable,
int rt,
struct lock_class_key *key, struct lock_class_key *key,
const char *lock_name) const char *lock_name)
{ {
@ -1008,7 +1003,6 @@ struct workqueue_struct *__create_workqueue_key(const char *name,
lockdep_init_map(&wq->lockdep_map, lock_name, key, 0); lockdep_init_map(&wq->lockdep_map, lock_name, key, 0);
wq->singlethread = singlethread; wq->singlethread = singlethread;
wq->freezeable = freezeable; wq->freezeable = freezeable;
wq->rt = rt;
INIT_LIST_HEAD(&wq->list); INIT_LIST_HEAD(&wq->list);
if (singlethread) { if (singlethread) {