From patchwork Thu May 20 16:52:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chase Douglas X-Patchwork-Id: 53094 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id C962AB7D24 for ; Fri, 21 May 2010 02:52:23 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OF8ym-0007BC-Ul; Thu, 20 May 2010 17:52:16 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OF8yd-00077W-Mq for kernel-team@lists.ubuntu.com; Thu, 20 May 2010 17:52:07 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OF8yd-0003IQ-Lc for ; Thu, 20 May 2010 17:52:07 +0100 Received: from cpe-75-180-27-10.columbus.res.rr.com ([75.180.27.10] helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1OF8yd-0001va-Be for kernel-team@lists.ubuntu.com; Thu, 20 May 2010 17:52:07 +0100 From: Chase Douglas To: kernel-team@lists.ubuntu.com Subject: [MAVERICK][PATCH] Revert "UBUNTU: SAUCE: Disable function tracing after hitting __schedule_bug" Date: Thu, 20 May 2010 12:52:05 -0400 Message-Id: <1274374325-6061-1-git-send-email-chase.douglas@canonical.com> X-Mailer: git-send-email 1.7.0.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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 --- kernel/sched.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) 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());