diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-02 22:48:43 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-02 22:48:43 +0200 |
| commit | 1d514333da19410751c195cc715f9dbe1bb4b08f (patch) | |
| tree | 1cb438d1b0c70169fdcff7bf8f92909656b21067 | |
| parent | Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff) | |
| parent | powerpc: fix memory corruption by pnv_alloc_idle_core_states (diff) | |
| download | linux-1d514333da19410751c195cc715f9dbe1bb4b08f.tar.xz linux-1d514333da19410751c195cc715f9dbe1bb4b08f.zip | |
Merge tag 'powerpc-4.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
Pull powerpc fix from Michael Ellerman:
"Fix memory corruption by pnv_alloc_idle_core_states"
* tag 'powerpc-4.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
powerpc: fix memory corruption by pnv_alloc_idle_core_states
| -rw-r--r-- | arch/powerpc/include/asm/cputhreads.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/cputhreads.h b/arch/powerpc/include/asm/cputhreads.h index 2bf8e9307be9..4c8ad592ae33 100644 --- 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) |