From 7347f9eb58c02fa29baf5cbcb5ff0fe6f1981a40 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 15 Oct 2007 17:00:08 +0200 Subject: [PATCH] --- yaml --- r: 69046 b: refs/heads/master c: 75d4ef16a6aa84f708188bada182315f80aab6fa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched_stats.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 049c041fd3d5..ec89f4d477a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30cfdcfc5f180fc21a3dad6ae3b7b2a9ee112186 +refs/heads/master: 75d4ef16a6aa84f708188bada182315f80aab6fa diff --git a/trunk/kernel/sched_stats.h b/trunk/kernel/sched_stats.h index c20a94dda61e..1d9ec98c38de 100644 --- a/trunk/kernel/sched_stats.h +++ b/trunk/kernel/sched_stats.h @@ -129,7 +129,7 @@ rq_sched_info_depart(struct rq *rq, unsigned long long delta) # define schedstat_set(var, val) do { } while (0) #endif -#if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT) +#ifdef CONFIG_SCHEDSTATS /* * Called when a process is dequeued from the active array and given * the cpu. We should note that with the exception of interactive @@ -233,5 +233,5 @@ sched_info_switch(struct task_struct *prev, struct task_struct *next) #else #define sched_info_queued(t) do { } while (0) #define sched_info_switch(t, next) do { } while (0) -#endif /* CONFIG_SCHEDSTATS || CONFIG_TASK_DELAY_ACCT */ +#endif /* CONFIG_SCHEDSTATS */