From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
linux-next@vger.kernel.org,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: Re: linux-next: tree build failure
Date: Fri, 16 Jan 2009 13:32:09 +0100 [thread overview]
Message-ID: <20090116123209.GA5421@elte.hu> (raw)
In-Reply-To: <20090116225342.83891680.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Ingo,
>
> On Fri, 16 Jan 2009 11:53:24 +0100 Ingo Molnar <mingo@elte.hu> wrote:
> >
> > * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > > Today's linux-next build (powerpc allnoconfig) failed like this:
> > >
> > > In file included from kernel/sched.c:1703:
> > > kernel/sched_fair.c: In function 'adaptive_gran':
> > > kernel/sched_fair.c:1324: error: 'struct sched_entity' has no member named 'avg_wakeup'
> > >
> > > Caused by commit e52fb7c097238d34f4d8e2a596f8a3f85b0c0565
> > > ("sched: prefer wakers") from the sched tree.
> >
> > that commit builds just fine on x86 and on powerpc as well.
>
> The build was an allnoconfig build, so CONFIG_SCHEDSTATS was not set.
ah, i see. So there's nothing powerpc-specific about this, it fails on x86
allnoconfig just as much? Is this because you test powerpc as the first
architecture in the linux-next builds?
I think i see where the mismerge comes from: you dont have the
perfcounters tree in linux-next which masked this interim stage. I've
fixed this via the commit below.
Ingo
-------------------->
>From 34cb61359b503d7aff6447acb037a5efd6ce93b2 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 16 Jan 2009 13:36:06 +0100
Subject: [PATCH] sched: fix !CONFIG_SCHEDSTATS build failure
Stephen Rothwell reported this linux-next build failure with !CONFIG_SCHEDSTATS:
| In file included from kernel/sched.c:1703:
| kernel/sched_fair.c: In function 'adaptive_gran':
| kernel/sched_fair.c:1324: error: 'struct sched_entity' has no member named 'avg_wakeup'
The start_runtime and avg_wakeup metrics are now not just for statistics,
but also for scheduling - so they always need to be available. (Also
move out the nr_migrations fields - for future perfcounters usage.)
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
include/linux/sched.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index daf4e07..5d56b54 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1031,6 +1031,10 @@ struct sched_entity {
u64 last_wakeup;
u64 avg_overlap;
+ u64 start_runtime;
+ u64 avg_wakeup;
+ u64 nr_migrations;
+
#ifdef CONFIG_SCHEDSTATS
u64 wait_start;
u64 wait_max;
@@ -1046,10 +1050,6 @@ struct sched_entity {
u64 exec_max;
u64 slice_max;
- u64 start_runtime;
- u64 avg_wakeup;
-
- u64 nr_migrations;
u64 nr_migrations_cold;
u64 nr_failed_migrations_affine;
u64 nr_failed_migrations_running;
next prev parent reply other threads:[~2009-01-16 12:32 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-16 5:37 linux-next: tree build failure Stephen Rothwell
2009-01-16 7:25 ` Peter Zijlstra
2009-01-16 9:03 ` Ingo Molnar
2009-01-16 10:39 ` Stephen Rothwell
2009-01-16 10:53 ` Ingo Molnar
2009-01-16 11:53 ` Stephen Rothwell
2009-01-16 12:32 ` Ingo Molnar [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-12-16 7:21 Stephen Rothwell
2009-12-16 9:02 ` Felipe Balbi
2009-12-16 10:10 ` Liam Girdwood
2009-10-01 3:19 Stephen Rothwell
2009-10-01 7:58 ` Jens Axboe
2009-10-01 10:41 ` Stephen Rothwell
2009-09-29 9:28 Jan Beulich
[not found] ` <4AC1E15502000078000516B5-Qfbpwmsw6RoS3W1tAdPHOtBPR1lH4CV8@public.gmane.org>
2009-09-29 9:51 ` roel kluin
[not found] ` <25e057c00909290251h55c0dc25o4ab1f2e84c920dca-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2009-09-30 6:29 ` Jan Beulich
2009-09-29 23:39 ` Hollis Blanchard
[not found] ` <1254267572.15622.1621.camel-yDUrRDS8jBVhsM67afOH+sxtgHpCUUYS@public.gmane.org>
2009-09-30 6:35 ` Jan Beulich
[not found] ` <4AC318450200007800017355-Qfbpwmsw6RoS3W1tAdPHOtBPR1lH4CV8@public.gmane.org>
2009-10-02 15:48 ` Hollis Blanchard
2009-10-05 6:58 ` Jan Beulich
2009-10-09 19:14 ` Hollis Blanchard
2009-10-14 22:57 ` Hollis Blanchard
2009-10-15 7:27 ` Jan Beulich
2009-10-19 18:19 ` Hollis Blanchard
2009-10-20 1:12 ` Rusty Russell
[not found] ` <200910201142.34006.rusty-8n+1lVoiYb80n/F98K4Iww@public.gmane.org>
2009-10-20 1:29 ` Hollis Blanchard
2009-09-24 5:21 Stephen Rothwell
[not found] ` <20090924152102.8d7d40cf.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2009-09-29 0:00 ` Hollis Blanchard
2009-08-17 8:39 Stephen Rothwell
2009-08-03 0:35 Stephen Rothwell
2009-08-03 1:01 ` NeilBrown
2009-08-03 1:30 ` Stephen Rothwell
2009-07-27 7:53 Stephen Rothwell
2009-07-27 9:21 ` Karsten Keil
2009-07-27 15:06 ` David Miller
2009-07-28 4:22 ` Stephen Rothwell
2009-04-07 3:41 Stephen Rothwell
2009-04-07 10:00 ` Mark Brown
2009-04-08 1:48 ` Takashi Iwai
2009-03-23 9:38 Stephen Rothwell
2009-03-23 22:27 ` Mauro Carvalho Chehab
2009-03-23 23:25 ` Stephen Rothwell
2009-03-05 7:41 Stephen Rothwell
2009-03-06 5:01 ` Rusty Russell
2008-11-28 10:04 Stephen Rothwell
2008-11-28 10:25 ` Takashi Iwai
2008-11-28 10:43 ` Stephen Rothwell
2008-11-28 17:23 ` Takashi Iwai
2008-10-21 8:30 Stephen Rothwell
2008-08-25 10:33 Stephen Rothwell
2008-08-25 16:36 ` Steven Rostedt
2008-06-30 14:35 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090116123209.GA5421@elte.hu \
--to=mingo@elte.hu \
--cc=a.p.zijlstra@chello.nl \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).