summaryrefslogtreecommitdiff
path: root/arch/cris/kernel
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2009-04-02 16:02:42 +0200
committerJesper Nilsson <jesper.nilsson@axis.com>2009-04-02 16:02:42 +0200
commit276e79ee6b3ff670dc9c041178da4b61af456a27 (patch)
treea6ac263bb1a5ae942bd78c70eee1cd9cef53dd80 /arch/cris/kernel
parent3b5a53689730bef6cb4dfde1de53e836e5299547 (diff)
parentb9d65c04773850ff3a82f69d43981be650e658a1 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask-for-cris into for-next
Diffstat (limited to 'arch/cris/kernel')
-rw-r--r--arch/cris/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/kernel/setup.c b/arch/cris/kernel/setup.c
index 04d48dd91ddf..b712f4934c4b 100644
--- a/arch/cris/kernel/setup.c
+++ b/arch/cris/kernel/setup.c
@@ -166,7 +166,7 @@ void __init setup_arch(char **cmdline_p)
static void *c_start(struct seq_file *m, loff_t *pos)
{
- return *pos < NR_CPUS ? (void *)(int)(*pos + 1): NULL;
+ return *pos < nr_cpu_ids ? (void *)(int)(*pos + 1) : NULL;
}
static void *c_next(struct seq_file *m, void *v, loff_t *pos)