From bb141e06a27e18d605b64d2d3cab135693896682 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 20 Jul 2013 18:35:54 +0000
Subject: kernel: merge a proposed fix from LKML for fixing infinite data
returned by /proc/timer_list
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 37484
---
.../generic/patches-3.10/030-timer_list_fix.patch | 45 ++++++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100644 target/linux/generic/patches-3.10/030-timer_list_fix.patch
(limited to 'target')
diff --git a/target/linux/generic/patches-3.10/030-timer_list_fix.patch b/target/linux/generic/patches-3.10/030-timer_list_fix.patch
new file mode 100644
index 0000000000..ef3c7988fd
--- /dev/null
+++ b/target/linux/generic/patches-3.10/030-timer_list_fix.patch
@@ -0,0 +1,45 @@
+Patch by: Nathan Zimmer <nzimmer@sgi.com>
+
+Fixes a regression in the commit
+"timer_list: Convert timer list to be a proper seq_file" which causes
+/proc/timer_list to return an infinite amount of data
+
+
+--- a/kernel/time/timer_list.c
++++ b/kernel/time/timer_list.c
+@@ -305,24 +305,26 @@ static void *timer_list_start(struct seq
+ if (!*offset) {
+ iter->cpu = -1;
+ iter->now = ktime_to_ns(ktime_get());
+- } else if (iter->cpu >= nr_cpu_ids) {
++ } else {
++ iter->cpu = cpumask_next(iter->cpu, cpu_online_mask);
++ if (iter->cpu >= nr_cpu_ids) {
+ #ifdef CONFIG_GENERIC_CLOCKEVENTS
+- if (!iter->second_pass) {
+- iter->cpu = -1;
+- iter->second_pass = true;
+- } else
+- return NULL;
++ if (!iter->second_pass) {
++ iter->cpu = -1;
++ iter->second_pass = true;
++ } else
++ return NULL;
+ #else
+- return NULL;
++ return NULL;
+ #endif
++ }
+ }
++
+ return iter;
+ }
+
+ static void *timer_list_next(struct seq_file *file, void *v, loff_t *offset)
+ {
+- struct timer_list_iter *iter = file->private;
+- iter->cpu = cpumask_next(iter->cpu, cpu_online_mask);
+ ++*offset;
+ return timer_list_start(file, offset);
+ }
--
cgit v1.2.3