lkml.org 
[lkml]   [2010]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/35] workqueue: kill RT workqueue
    Date
    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>
    ---
    include/linux/workqueue.h | 20 +++++++++-----------
    kernel/workqueue.c | 6 ------
    2 files changed, 9 insertions(+), 17 deletions(-)

    diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
    index 9466e86..0697946 100644
    --- a/include/linux/workqueue.h
    +++ b/include/linux/workqueue.h
    @@ -181,12 +181,11 @@ static inline void destroy_work_on_stack(struct work_struct *work) { }


    extern struct workqueue_struct *
    -__create_workqueue_key(const char *name, int singlethread,
    - int freezeable, int rt, struct lock_class_key *key,
    - const char *lock_name);
    +__create_workqueue_key(const char *name, int singlethread, int freezeable,
    + struct lock_class_key *key, const char *lock_name);

    #ifdef CONFIG_LOCKDEP
    -#define __create_workqueue(name, singlethread, freezeable, rt) \
    +#define __create_workqueue(name, singlethread, freezeable) \
    ({ \
    static struct lock_class_key __key; \
    const char *__lock_name; \
    @@ -197,19 +196,18 @@ __create_workqueue_key(const char *name, int singlethread,
    __lock_name = #name; \
    \
    __create_workqueue_key((name), (singlethread), \
    - (freezeable), (rt), &__key, \
    + (freezeable), &__key, \
    __lock_name); \
    })
    #else
    -#define __create_workqueue(name, singlethread, freezeable, rt) \
    - __create_workqueue_key((name), (singlethread), (freezeable), (rt), \
    +#define __create_workqueue(name, singlethread, freezeable) \
    + __create_workqueue_key((name), (singlethread), (freezeable), \
    NULL, NULL)
    #endif

    -#define create_workqueue(name) __create_workqueue((name), 0, 0, 0)
    -#define create_rt_workqueue(name) __create_workqueue((name), 0, 0, 1)
    -#define create_freezeable_workqueue(name) __create_workqueue((name), 1, 1, 0)
    -#define create_singlethread_workqueue(name) __create_workqueue((name), 1, 0, 0)
    +#define create_workqueue(name) __create_workqueue((name), 0, 0)
    +#define create_freezeable_workqueue(name) __create_workqueue((name), 1, 1)
    +#define create_singlethread_workqueue(name) __create_workqueue((name), 1, 0)

    extern void destroy_workqueue(struct workqueue_struct *wq);

    diff --git a/kernel/workqueue.c b/kernel/workqueue.c
    index 327d2de..1a47fbf 100644
    --- a/kernel/workqueue.c
    +++ b/kernel/workqueue.c
    @@ -62,7 +62,6 @@ struct workqueue_struct {
    const char *name;
    int singlethread;
    int freezeable; /* Freeze threads during suspend */
    - int rt;
    #ifdef CONFIG_LOCKDEP
    struct lockdep_map lockdep_map;
    #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)
    {
    - struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
    struct workqueue_struct *wq = cwq->wq;
    const char *fmt = is_wq_single_threaded(wq) ? "%s" : "%s/%d";
    struct task_struct *p;
    @@ -963,8 +961,6 @@ static int create_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu)
    */
    if (IS_ERR(p))
    return PTR_ERR(p);
    - if (cwq->wq->rt)
    - sched_setscheduler_nocheck(p, SCHED_FIFO, &param);
    cwq->thread = p;

    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,
    int singlethread,
    int freezeable,
    - int rt,
    struct lock_class_key *key,
    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);
    wq->singlethread = singlethread;
    wq->freezeable = freezeable;
    - wq->rt = rt;
    INIT_LIST_HEAD(&wq->list);

    if (singlethread) {
    --
    1.6.4.2


    \
     
     \ /
      Last update: 2010-06-28 23:15    [W:2.431 / U:1.344 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site