Problem: make O=/bld/3.0.3-rt11/ kernel/fork.o /home/jkacur/jk-2.6/kernel/fork.c:91: error: section of ‘name’ conflicts with previous declaration __cacheline_aligned is already part of the definition of DEFINE_RWLOCK for -rt However it is not always used for the tasklist_lock in non-rt, so it can't simply be added to the definition of DEFINE_RWLOCK in non-rt, so I modified the definition in fork.c Signed-off-by: John Kacur --- kernel/fork.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/kernel/fork.c b/kernel/fork.c index aa5fe26..0d264ec 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -87,7 +87,11 @@ int max_threads; /* tunable limit on nr_threads */ DEFINE_PER_CPU(unsigned long, process_counts) = 0; +#ifndef CONFIG_PREEMPT_RT_FULL __cacheline_aligned DEFINE_RWLOCK(tasklist_lock); /* outer */ +#else +DEFINE_RWLOCK(tasklist_lock); /* outer */ +#endif #ifdef CONFIG_PROVE_RCU int lockdep_tasklist_lock_is_held(void) -- 1.7.2.3 -- To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
