git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm2385', 'spi/topic...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
include
/
asm
/
cputhreads.h
diff --git
a/arch/powerpc/include/asm/cputhreads.h
b/arch/powerpc/include/asm/cputhreads.h
index 2bf8e9307be9833b5bf9af51defdfada8feae68d..4c8ad592ae3351d96f7e225411d9f551657c5bc7 100644
(file)
--- a/
arch/powerpc/include/asm/cputhreads.h
+++ b/
arch/powerpc/include/asm/cputhreads.h
@@
-55,7
+55,7
@@
static inline cpumask_t cpu_thread_mask_to_cores(const struct cpumask *threads)
static inline int cpu_nr_cores(void)
{
- return
NR_CPUS
>> threads_shift;
+ return
nr_cpu_ids
>> threads_shift;
}
static inline cpumask_t cpu_online_cores_map(void)