lkml.org 
[lkml]   [2013]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the akpm tree with the tip tree
    Hi Andrew,

    Today's linux-next merge of the akpm tree got a conflict in
    kernel/posix-cpu-timers.c between commits a85721601ad2 ("posix_timers:
    Kick full dynticks CPUs when a posix cpu timer is armed") and
    555347f6c080 ("posix_timers: New API to prevent from stopping the tick
    when timers are running") from the tip tree and commit "posix_cpu_timer:
    consolidate expiry time type" from the akpm tree.

    I fixed it up (see below) and can carry the fix as necessary (no action
    is required).

    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au

    diff --cc kernel/posix-cpu-timers.c
    index 84d5cb3,e5286b5..0000000
    --- a/kernel/posix-cpu-timers.c
    +++ b/kernel/posix-cpu-timers.c
    @@@ -155,22 -106,7 +108,22 @@@ static void bump_cpu_timer(struct k_iti
    }
    }

    +/**
    + * task_cputime_zero - Check a task_cputime struct for all zero fields.
    + *
    + * @cputime: The struct to compare.
    + *
    + * Checks @cputime to see if all fields are zero. Returns true if all fields
    + * are zero, false if any field is nonzero.
    + */
    +static inline int task_cputime_zero(const struct task_cputime *cputime)
    +{
    + if (!cputime->utime && !cputime->stime && !cputime->sum_exec_runtime)
    + return 1;
    + return 0;
    +}
    +
    - static inline cputime_t prof_ticks(struct task_struct *p)
    + static inline unsigned long long prof_ticks(struct task_struct *p)
    {
    cputime_t utime, stime;

    @@@ -1408,8 -1312,8 +1354,8 @@@ void set_process_cpu_timer(struct task_
    }

    if (!*newval)
    - return;
    + goto out;
    - *newval += now.cpu;
    + *newval += now;
    }

    /*
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2013-04-23 10:01    [W:3.784 / U:0.348 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site