diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-03-28 11:03:35 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-03-28 11:03:35 +1100 |
| commit | 840c91dc6a13b160f5b6e5c79c430dffac11c945 (patch) | |
| tree | 5309824f4531b2611a575e7971a935d2e95feb02 /arch/s390/kernel/vtime.c | |
| parent | 3dfc9b02864b19f4dab376f14479ee4ad1de6c9e (diff) | |
| parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
| download | linux-840c91dc6a13b160f5b6e5c79c430dffac11c945.tar.bz2 | |
update to v4.11-rc4 due to memory corruption bug in rc2
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); |