Messages in this thread | | | Date | Thu, 3 Sep 2009 19:11:38 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the percpu tree with the tip tree |
| |
Hi all,
Today's linux-next merge of the percpu tree got a conflict in kernel/sched.c between commit 84e9dabf6e6a78928c6a1a8ba235c9fb0908d0f8 ("sched: Rename init_cfs_rq => init_tg_cfs_rq") from the tip tree and commit b9bf3121af348d9255f1c917830fe8c2df52efcb ("percpu: use DEFINE_PER_CPU_SHARED_ALIGNED()") from the percpu tree.
I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc kernel/sched.c index 4061929,d3d7e76..0000000 --- a/kernel/sched.c +++ b/kernel/sched.c @@@ -318,7 -318,7 +318,7 @@@ struct task_group root_task_group /* Default task group's sched entity on each cpu */ static DEFINE_PER_CPU(struct sched_entity, init_sched_entity); /* Default task group's cfs_rq on each cpu */ - static DEFINE_PER_CPU(struct cfs_rq, init_tg_cfs_rq) ____cacheline_aligned_in_smp; -static DEFINE_PER_CPU_SHARED_ALIGNED(struct cfs_rq, init_cfs_rq); ++static DEFINE_PER_CPU_SHARED_ALIGNED(struct cfs_rq, init_tg_cfs_rq); #endif /* CONFIG_FAIR_GROUP_SCHED */ #ifdef CONFIG_RT_GROUP_SCHED
| |