From: John Kacur <jkacur@redhat.com>
To: Thomas Gleixner <tglx@linutronix.de>,
rt-users <linux-rt-users@vger.kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
lkml <linux-kernel@vger.kernel.org>,
John Kacur <jkacur@redhat.com>
Subject: [PATCH] PREEMPT_RT_FULL Build error fix
Date: Fri, 26 Aug 2011 14:06:33 +0200 [thread overview]
Message-ID: <1314360393-13605-1-git-send-email-jkacur@redhat.com> (raw)
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
next reply other threads:[~2011-08-26 12:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-26 12:06 John Kacur [this message]
2011-09-01 19:14 ` [PATCH] PREEMPT_RT_FULL Build error fix Thomas Gleixner
2011-09-06 9:25 ` John Kacur
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=1314360393-13605-1-git-send-email-jkacur@redhat.com \
--to=jkacur@redhat.com \
--cc=a.p.zijlstra@chello.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--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