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 master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[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 c36353e8c1404b22ae5dfbd8f0b0bd8f1a8214b8..b0d8ca8e5eebd7917a87b88ebfae98a258fa0cc4 100644
(file)
--- a/
arch/s390/kernel/time.c
+++ b/
arch/s390/kernel/time.c
@@
-282,7
+282,7
@@
static inline void start_hz_timer(void)
{
if (!cpu_isset(smp_processor_id(), nohz_cpu_mask))
return;
- account_ticks(
__KSTK_PTREGS
(current));
+ account_ticks(
task_pt_regs
(current));
cpu_clear(smp_processor_id(), nohz_cpu_mask);
}