diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-07-31 10:27:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-31 10:28:53 +0200 |
| commit | 555ee95a0a5a525ad2f1654fab0bd157de832b4f (patch) | |
| tree | 5ff341bedaa848027d5eba1e2a9fbfaeb9501250 /arch/alpha | |
| parent | 8400935737bf02d97da281bdcd139a421624b6ba (diff) | |
| parent | de734f89b67c2df30e35a09e7e56a3659e5b6ac6 (diff) | |
| download | op-kernel-dev-555ee95a0a5a525ad2f1654fab0bd157de832b4f.zip op-kernel-dev-555ee95a0a5a525ad2f1654fab0bd157de832b4f.tar.gz | |
Merge branch 'timers/nohz-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/nohz
Pull NOHZ updates from Frederic Weisbecker:
- Fix some jiffies based cputime assumptions. No real harm because the
concerned code isn't used by full dynticks.
- Simplify jiffies <-> usecs conversions. Remove dead code.
- Remove early hacks on nohz full code that avoided messing up idle
nohz internals. Now nohz integrates well full and idle and such hack
have become needless.
- Restart nohz full tick from irq exit. A simplification and a
preparation for future optimization on scheduler kick to nohz full.
- Simple code cleanups.
- Tile driver isolation enhancement on top of nohz.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/kernel/osf_sys.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 36dc91a..6cc0816 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -1138,6 +1138,7 @@ SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru) { struct rusage32 r; cputime_t utime, stime; + unsigned long utime_jiffies, stime_jiffies; if (who != RUSAGE_SELF && who != RUSAGE_CHILDREN) return -EINVAL; @@ -1146,14 +1147,18 @@ SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru) switch (who) { case RUSAGE_SELF: task_cputime(current, &utime, &stime); - jiffies_to_timeval32(utime, &r.ru_utime); - jiffies_to_timeval32(stime, &r.ru_stime); + utime_jiffies = cputime_to_jiffies(utime); + stime_jiffies = cputime_to_jiffies(stime); + jiffies_to_timeval32(utime_jiffies, &r.ru_utime); + jiffies_to_timeval32(stime_jiffies, &r.ru_stime); r.ru_minflt = current->min_flt; r.ru_majflt = current->maj_flt; break; case RUSAGE_CHILDREN: - jiffies_to_timeval32(current->signal->cutime, &r.ru_utime); - jiffies_to_timeval32(current->signal->cstime, &r.ru_stime); + utime_jiffies = cputime_to_jiffies(current->signal->cutime); + stime_jiffies = cputime_to_jiffies(current->signal->cstime); + jiffies_to_timeval32(utime_jiffies, &r.ru_utime); + jiffies_to_timeval32(stime_jiffies, &r.ru_stime); r.ru_minflt = current->signal->cmin_flt; r.ru_majflt = current->signal->cmaj_flt; break; |
