projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
[firefly-linux-kernel-4.4.55.git]
/
arch
/
s390
/
kernel
/
time.c
diff --git
a/arch/s390/kernel/time.c
b/arch/s390/kernel/time.c
index b0d8ca8e5eebd7917a87b88ebfae98a258fa0cc4..7c0fe152a111f394b6310a6fbd535615388372fd 100644
(file)
--- a/
arch/s390/kernel/time.c
+++ b/
arch/s390/kernel/time.c
@@
-214,7
+214,7
@@
void account_ticks(struct pt_regs *regs)
#endif
#ifdef CONFIG_VIRT_CPU_ACCOUNTING
- account_
user
_vtime(current);
+ account_
tick
_vtime(current);
#else
while (ticks--)
update_process_times(user_mode(regs));