diff options
author | Len Brown <len.brown@intel.com> | 2013-03-29 14:02:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-29 14:12:25 -0400 |
commit | ed176886b68fbc450ddbe808684a142fcad72b56 (patch) | |
tree | cfff43bef23dd29ebd9b52671943cd68e3816364 /arch/ia64/kernel | |
parent | 67e17c1100d741469ce22c09ba98b55fc2aaad50 (diff) |
ia64 idle: delete stale (*idle)() function pointer
Commit 3e7fc708eb41 ("ia64 idle: delete pm_idle") in 3.9-rc1 didn't
finish the job, leaving an un-initialized reference to (*idle)().
[ Haven't seen a crash from this - but seems like we are just being
lucky that "idle" is zero so it does get initialized before we jump to
randomland - Len ]
Reported-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ia64/kernel')
-rw-r--r-- | arch/ia64/kernel/process.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index e34f565f595a..6f7dc8b7b35c 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c | |||
@@ -291,7 +291,6 @@ cpu_idle (void) | |||
291 | } | 291 | } |
292 | 292 | ||
293 | if (!need_resched()) { | 293 | if (!need_resched()) { |
294 | void (*idle)(void); | ||
295 | #ifdef CONFIG_SMP | 294 | #ifdef CONFIG_SMP |
296 | min_xtp(); | 295 | min_xtp(); |
297 | #endif | 296 | #endif |
@@ -299,9 +298,7 @@ cpu_idle (void) | |||
299 | if (mark_idle) | 298 | if (mark_idle) |
300 | (*mark_idle)(1); | 299 | (*mark_idle)(1); |
301 | 300 | ||
302 | if (!idle) | 301 | default_idle(); |
303 | idle = default_idle; | ||
304 | (*idle)(); | ||
305 | if (mark_idle) | 302 | if (mark_idle) |
306 | (*mark_idle)(0); | 303 | (*mark_idle)(0); |
307 | #ifdef CONFIG_SMP | 304 | #ifdef CONFIG_SMP |