Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux into akpm
Pull s390 regression fix from Martin Schwidefsky:
"The recent fix for the s390 sched_clock() function uncovered yet
another bug in s390_next_ktime which causes an endless loop in KVM.
This regression should be fixed before v3.8.
I keep the fingers crossed that this is the last one for v3.8."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/timer: avoid overflow when programming clock comparator
+3
+3
arch/s390/kernel/time.c
+3
arch/s390/kernel/time.c
···
120
120
nsecs = ktime_to_ns(ktime_add(timespec_to_ktime(ts), expires));
121
121
do_div(nsecs, 125);
122
122
S390_lowcore.clock_comparator = sched_clock_base_cc + (nsecs << 9);
123
+
/* Program the maximum value if we have an overflow (== year 2042) */
124
+
if (unlikely(S390_lowcore.clock_comparator < sched_clock_base_cc))
125
+
S390_lowcore.clock_comparator = -1ULL;
123
126
set_clock_comparator(S390_lowcore.clock_comparator);
124
127
return 0;
125
128
}