[MAVERICK] Revert "UBUNTU: SAUCE: Disable function tracing after hitting __schedule_bug"

Message ID 1274374325-6061-1-git-send-email-chase.douglas@canonical.com
State Accepted
Delegated to: Leann Ogasawara
Headers show

Commit Message

Chase Douglas May 20, 2010, 4:52 p.m.
This reverts commit 63da13e29daa6cbdeaa2a6c18d81d000a5f6fb1a.

This functionality can be enabled at runtime, so this patch is
unnecessary. I have documented the runtime functionality and sent a
patch upstream, which should be merged in for .35.

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
 kernel/sched.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)


Leann Ogasawara May 21, 2010, 12:49 a.m. | #1
Applied to Maverick master.  As a side note, we were planning on
dropping this as well per our UDS Ubuntu delta review, so thanks for
saving me the extra work :)



diff --git a/kernel/sched.c b/kernel/sched.c
index fa0c12f..0724bde 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3620,8 +3620,6 @@  static noinline void __schedule_bug(struct task_struct *prev)
 	struct pt_regs *regs = get_irq_regs();
-	tracing_off();
 	printk(KERN_ERR "BUG: scheduling while atomic: %s/%d/0x%08x\n",
 		prev->comm, prev->pid, preempt_count());