diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 11:36:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 11:36:31 -0700 |
| commit | ea431793f198e26d1553f36ed8b5a830b531eee4 (patch) | |
| tree | b97d79adee8cef49c65b0be96aa38d17f4005e18 /arch/cris/kernel | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask-for-cris into for-next (diff) | |
| download | linux-dev-ea431793f198e26d1553f36ed8b5a830b531eee4.tar.xz linux-dev-ea431793f198e26d1553f36ed8b5a830b531eee4.zip | |
Merge branch 'for-linus' of git://repo.or.cz/cris-mirror
* 'for-linus' of git://repo.or.cz/cris-mirror:
CRISv32: Remove extraneous space between -I and the path.
cris: convert obsolete hw_interrupt_type to struct irq_chip
BUG to BUG_ON changes
cpumask: use mm_cpumask() wrapper: cris
cpumask: Use accessors code.: cris
cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.: cris
Diffstat (limited to 'arch/cris/kernel')
| -rw-r--r-- | arch/cris/kernel/setup.c | 2 |
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) |