lkml.org 
[lkml]   [2011]   [Oct]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/17] freezer: kill PF_FREEZING
    Date
    With the previous changes, there's no meaningful difference between
    PF_FREEZING and PF_FROZEN. Remove PF_FREEZING and use PF_FROZEN
    instead in task_contributes_to_load().

    Signed-off-by: Tejun Heo <tj@kernel.org>
    ---
    include/linux/sched.h | 3 +--
    kernel/freezer.c | 6 ------
    2 files changed, 1 insertions(+), 8 deletions(-)

    diff --git a/include/linux/sched.h b/include/linux/sched.h
    index e8acce7..57f916d 100644
    --- a/include/linux/sched.h
    +++ b/include/linux/sched.h
    @@ -220,7 +220,7 @@ extern char ___assert_task_state[1 - 2*!!(
    ((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0)
    #define task_contributes_to_load(task) \
    ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \
    - (task->flags & PF_FREEZING) == 0)
    + (task->flags & PF_FROZEN) == 0)

    #define __set_task_state(tsk, state_value) \
    do { (tsk)->state = (state_value); } while (0)
    @@ -1766,7 +1766,6 @@ extern void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *
    #define PF_MEMALLOC 0x00000800 /* Allocating memory */
    #define PF_NPROC_EXCEEDED 0x00001000 /* set_user noticed that RLIMIT_NPROC was exceeded */
    #define PF_USED_MATH 0x00002000 /* if unset the fpu must be initialized before use */
    -#define PF_FREEZING 0x00004000 /* freeze in progress. do not account to load */
    #define PF_NOFREEZE 0x00008000 /* this thread should not be frozen */
    #define PF_FROZEN 0x00010000 /* frozen for system suspend */
    #define PF_FSTRANS 0x00020000 /* inside a filesystem transaction */
    diff --git a/kernel/freezer.c b/kernel/freezer.c
    index 5c911c0..3be1e36 100644
    --- a/kernel/freezer.c
    +++ b/kernel/freezer.c
    @@ -44,9 +44,6 @@ repeat:
    recalc_sigpending(); /* We sent fake signal, clean it up */
    spin_unlock_irq(&current->sighand->siglock);

    - /* prevent accounting of that task to load */
    - current->flags |= PF_FREEZING;
    -
    for (;;) {
    set_current_state(TASK_UNINTERRUPTIBLE);
    if (!freezing(current) ||
    @@ -56,9 +53,6 @@ repeat:
    schedule();
    }

    - /* Remove the accounting blocker */
    - current->flags &= ~PF_FREEZING;
    -
    /* leave FROZEN */
    spin_lock_irq(&freezer_lock);
    if (freezing(current))
    --
    1.7.3.1


    \
     
     \ /
      Last update: 2011-10-31 20:09    [W:0.019 / U:5.000 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site