diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-03 07:06:59 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-03 07:06:59 +0200 |
| commit | a8e28440016bfb23bec266c4c66eacca6ea2d48b (patch) | |
| tree | 27d528294f7886c434c8072a034d211acc06d077 /arch/s390/kernel/vtime.c | |
| parent | alpha: fix stack smashing in old_adjtimex(2) (diff) | |
| parent | statx: Include a mask for stx_attributes in struct statx (diff) | |
| download | linux-a8e28440016bfb23bec266c4c66eacca6ea2d48b.tar.xz linux-a8e28440016bfb23bec266c4c66eacca6ea2d48b.zip | |
Merge branch 'work.statx' into for-next
Diffstat (limited to 'arch/s390/kernel/vtime.c')
| -rw-r--r-- | arch/s390/kernel/vtime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c index c14fc9029912..072d84ba42a3 100644 --- a/arch/s390/kernel/vtime.c +++ b/arch/s390/kernel/vtime.c @@ -111,7 +111,7 @@ static inline u64 scale_vtime(u64 vtime) } static void account_system_index_scaled(struct task_struct *p, - cputime_t cputime, cputime_t scaled, + u64 cputime, u64 scaled, enum cpu_usage_stat index) { p->stimescaled += cputime_to_nsecs(scaled); |