diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2019-04-30 22:52:03 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-04-30 22:52:03 +1000 |
| commit | bdc7c970bcdce1c018957e0158230bc025682ba2 (patch) | |
| tree | 8ccb80ea00653b2a218b401bf0728a80a1ddaaa7 /arch/powerpc/kernel/setup-common.c | |
| parent | 7ae3f6e130e8dc6188b59e3b4ebc2f16e9c8d053 (diff) | |
| parent | e9cef0189c5b217fcd4788562862defc27632a01 (diff) | |
Merge branch 'topic/ppc-kvm' into next
Merge our topic branch shared with KVM. In particular this includes the
rewrite of the idle code into C.
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 1729bf409562..70dc10aa0ccf 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -401,8 +401,8 @@ void __init check_for_initrd(void) #ifdef CONFIG_SMP -int threads_per_core, threads_per_subcore, threads_shift; -cpumask_t threads_core_mask; +int threads_per_core, threads_per_subcore, threads_shift __read_mostly; +cpumask_t threads_core_mask __read_mostly; EXPORT_SYMBOL_GPL(threads_per_core); EXPORT_SYMBOL_GPL(threads_per_subcore); EXPORT_SYMBOL_GPL(threads_shift); |