diff options
| author | Tejun Heo <tj@kernel.org> | 2009-09-15 09:57:19 +0900 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-09-15 09:57:19 +0900 |
| commit | 5579fd7e6aed8860ea0c8e3f11897493153b10ad (patch) | |
| tree | 8f797ccd0f1a2c88f1605ae9e90b3ac17485de27 /arch/x86/Kconfig | |
| parent | 04a13c7c632e1fe04a5f6e6c83565d2559e37598 (diff) | |
| parent | c2a7e818019f20a5cf7fb26a6eb59e212e6c0cd8 (diff) | |
| download | op-kernel-dev-5579fd7e6aed8860ea0c8e3f11897493153b10ad.zip op-kernel-dev-5579fd7e6aed8860ea0c8e3f11897493153b10ad.tar.gz | |
Merge branch 'for-next' into for-linus
* pcpu_chunk_page_occupied() doesn't exist in for-next.
* pcpu_chunk_addr_search() updated to use raw_smp_processor_id().
Conflicts:
mm/percpu.c
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 13ffa5d..869d7d3 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -150,7 +150,10 @@ config ARCH_HAS_CACHE_LINE_SIZE config HAVE_SETUP_PER_CPU_AREA def_bool y -config HAVE_DYNAMIC_PER_CPU_AREA +config NEED_PER_CPU_EMBED_FIRST_CHUNK + def_bool y + +config NEED_PER_CPU_PAGE_FIRST_CHUNK def_bool y config HAVE_CPUMASK_OF_CPU_MAP |
