diff options
| author | Tejun Heo <tj@kernel.org> | 2009-09-14 20:57:19 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-09-14 20:57:19 -0400 |
| commit | 5579fd7e6aed8860ea0c8e3f11897493153b10ad (patch) | |
| tree | 8f797ccd0f1a2c88f1605ae9e90b3ac17485de27 /arch/ia64/Kconfig | |
| parent | 04a13c7c632e1fe04a5f6e6c83565d2559e37598 (diff) | |
| parent | c2a7e818019f20a5cf7fb26a6eb59e212e6c0cd8 (diff) | |
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/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 170042b420d4..328d2f8b8c3f 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -89,6 +89,9 @@ config GENERIC_TIME_VSYSCALL | |||
| 89 | bool | 89 | bool |
| 90 | default y | 90 | default y |
| 91 | 91 | ||
| 92 | config HAVE_LEGACY_PER_CPU_AREA | ||
| 93 | def_bool y | ||
| 94 | |||
| 92 | config HAVE_SETUP_PER_CPU_AREA | 95 | config HAVE_SETUP_PER_CPU_AREA |
| 93 | def_bool y | 96 | def_bool y |
| 94 | 97 | ||