diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-29 18:44:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-29 18:44:22 -0400 |
| commit | ed223129a30de7d244ca9b59819f5532c9caf039 (patch) | |
| tree | 9ea5649276c18f13356c4db1663368e071081a25 /arch/sparc/kernel/ds.c | |
| parent | ffaba674090f287afe0c44fd8d978c64c03581a8 (diff) | |
| parent | 81f1adf01224f5c0be5f90f43664f799c1f7bb2d (diff) | |
Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask-for-sparc
Conflicts:
arch/sparc/kernel/smp_64.c
Diffstat (limited to 'arch/sparc/kernel/ds.c')
| -rw-r--r-- | arch/sparc/kernel/ds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c index 57c39843fb2a..90350f838f05 100644 --- a/arch/sparc/kernel/ds.c +++ b/arch/sparc/kernel/ds.c | |||
| @@ -653,7 +653,7 @@ static void __cpuinit dr_cpu_data(struct ds_info *dp, | |||
| 653 | if (cpu_list[i] == CPU_SENTINEL) | 653 | if (cpu_list[i] == CPU_SENTINEL) |
| 654 | continue; | 654 | continue; |
| 655 | 655 | ||
| 656 | if (cpu_list[i] < NR_CPUS) | 656 | if (cpu_list[i] < nr_cpu_ids) |
| 657 | cpu_set(cpu_list[i], mask); | 657 | cpu_set(cpu_list[i], mask); |
| 658 | } | 658 | } |
| 659 | 659 | ||