This patch corrects the issue with /proc/timer_list reported by Holger. When reading from the proc file with a sufficently small buffer, 2k so not really that small, there was one could get hung trying to read the file a chunk at a time.
Signed-off-by Nathan Zimmer <[email protected]> Reported-by: Holger Hans Peter Freyther <[email protected]> Cc: <[email protected]> # 3.10.x Cc: John Stultz <[email protected]> Cc: Thomas Gleixner <[email protected]> --- kernel/time/timer_list.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c index 3bdf283..08d7fbd 100644 --- a/kernel/time/timer_list.c +++ b/kernel/time/timer_list.c @@ -265,10 +265,9 @@ static inline void timer_list_header(struct seq_file *m, u64 now) static int timer_list_show(struct seq_file *m, void *v) { struct timer_list_iter *iter = v; - u64 now = ktime_to_ns(ktime_get()); if (iter->cpu == -1 && !iter->second_pass) - timer_list_header(m, now); + timer_list_header(m, iter->now); else if (!iter->second_pass) print_cpu(m, iter->cpu, iter->now); #ifdef CONFIG_GENERIC_CLOCKEVENTS -- 1.8.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

