Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755610AbXKBOWr (ORCPT ); Fri, 2 Nov 2007 10:22:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753878AbXKBOWk (ORCPT ); Fri, 2 Nov 2007 10:22:40 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:60340 "EHLO e6.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753688AbXKBOWj (ORCPT ); Fri, 2 Nov 2007 10:22:39 -0400 From: Balbir Singh To: Ingo Molnar Cc: Balbir Singh , Peter Zijlstra , Andrew Morton , Linux Kernel Mailing List Date: Fri, 02 Nov 2007 19:52:20 +0530 Message-Id: <20071102142220.24166.49046.sendpatchset@balbir-laptop> Subject: [PATCH] Fix delay accounting regression Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1594 Lines: 44 Fix the delay accounting regression introduced by commit 75d4ef16a6aa84f708188bada182315f80aab6fa. rq no longer has sched_info data associated with it. task_struct sched_info structure is used by delay accounting to provide back statistics to user space. Signed-off-by: Balbir Singh --- kernel/sched_stats.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN kernel/sched_stats.h~delayacct-define-bug kernel/sched_stats.h --- linux-2.6-latest/kernel/sched_stats.h~delayacct-define-bug 2007-11-02 19:02:07.000000000 +0530 +++ linux-2.6-latest-balbir/kernel/sched_stats.h 2007-11-02 19:51:30.000000000 +0530 @@ -127,7 +127,7 @@ rq_sched_info_depart(struct rq *rq, unsi # define schedstat_set(var, val) do { } while (0) #endif -#ifdef CONFIG_SCHEDSTATS +#if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT) /* * Called when a process is dequeued from the active array and given * the cpu. We should note that with the exception of interactive @@ -231,5 +231,5 @@ sched_info_switch(struct task_struct *pr #else #define sched_info_queued(t) do { } while (0) #define sched_info_switch(t, next) do { } while (0) -#endif /* CONFIG_SCHEDSTATS */ +#endif /* CONFIG_SCHEDSTATS || CONFIG_TASK_DELAY_ACCT */ _ -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/