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/mdesc.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/mdesc.c')
| -rw-r--r-- | arch/sparc/kernel/mdesc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c index 3f79f0c23a08..f0e6ed23a468 100644 --- a/arch/sparc/kernel/mdesc.c +++ b/arch/sparc/kernel/mdesc.c | |||
| @@ -567,7 +567,7 @@ static void __init report_platform_properties(void) | |||
| 567 | max_cpu = NR_CPUS; | 567 | max_cpu = NR_CPUS; |
| 568 | } | 568 | } |
| 569 | for (i = 0; i < max_cpu; i++) | 569 | for (i = 0; i < max_cpu; i++) |
| 570 | cpu_set(i, cpu_possible_map); | 570 | set_cpu_possible(i, true); |
| 571 | } | 571 | } |
| 572 | #endif | 572 | #endif |
| 573 | 573 | ||