From: John Kacur <jkacur@redhat.com>
To: Clark Williams <williams@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>,
lkml <linux-kernel@vger.kernel.org>, Ingo Molnar <mingo@elte.hu>,
Carsten Emde <C.Emde@osadl.org>,
rt-users <linux-rt-users@vger.kernel.org>,
John Kacur <jkacur@redhat.com>
Subject: [PATCH 2/5] rt-tests: Separate the #ifdef LIBNUMA_API_VERSION functions.
Date: Wed, 27 Jan 2010 21:24:25 +0100 [thread overview]
Message-ID: <1264623868-23595-3-git-send-email-jkacur@redhat.com> (raw)
In-Reply-To: <1264623868-23595-1-git-send-email-jkacur@redhat.com>
Separate the #ifdef LIBNUMA_API_VERSION of function rt_numa_numa_node_of_cpu,
it is slightly cleaner this way.
Signed-off-by: John Kacur <jkacur@redhat.com>
---
src/cyclictest/rt_numa.h | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/cyclictest/rt_numa.h b/src/cyclictest/rt_numa.h
index 14837ff..8d44097 100644
--- a/src/cyclictest/rt_numa.h
+++ b/src/cyclictest/rt_numa.h
@@ -58,15 +58,20 @@ static void numa_on_and_available()
fatal("--numa specified and numa functions not available.\n");
}
+#if LIBNUMA_API_VERSION >= 2
static int rt_numa_numa_node_of_cpu(int cpu)
{
-#if LIBNUMA_API_VERSION >= 2
int node;
node = numa_node_of_cpu(cpu);
if (node == -1)
fatal("invalid cpu passed to numa_node_of_cpu(%d)\n", cpu);
return node;
-#else
+}
+
+#else /* LIBNUMA_API_VERSION == 1 */
+
+static int rt_numa_numa_node_of_cpu(int cpu)
+{
unsigned char cpumask[16];
int node, ret, idx, bit;
int max_node, max_cpus;
@@ -96,10 +101,10 @@ static int rt_numa_numa_node_of_cpu(int cpu)
errno = EINVAL;
end:
return ret;
-
-#endif
}
+#endif /* LIBNUMA_API_VERSION */
+
static void *rt_numa_numa_alloc_onnode(size_t size, int node, int cpu)
{
void *stack;
--
1.6.6
next prev parent reply other threads:[~2010-01-27 20:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-27 20:24 [PATCH 0/5] rt-tests: rt_numa.h clean-ups, and dependency files John Kacur
2010-01-27 20:24 ` [PATCH 1/5] rt-tests: Add header including copyright notice to rt_numa.h John Kacur
2010-01-27 20:24 ` John Kacur [this message]
2010-01-27 20:24 ` [PATCH 3/5] rt-tests: Remove the ret variable, the end label and the goto John Kacur
2010-01-27 20:24 ` [PATCH 4/5] rt-tests: Fix some style problems, such as spaces instead of tabs John Kacur
2010-01-27 20:24 ` [PATCH 5/5] rt-tests: Automatically generate dependencies 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=1264623868-23595-3-git-send-email-jkacur@redhat.com \
--to=jkacur@redhat.com \
--cc=C.Emde@osadl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=williams@redhat.com \
/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).