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 /lib/Kconfig.debug | |
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 'lib/Kconfig.debug')
-rw-r--r-- | lib/Kconfig.debug | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 12327b2bb785..43173c4e0ade 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
@@ -790,6 +790,21 @@ config DEBUG_BLOCK_EXT_DEVT | |||
790 | 790 | ||
791 | Say N if you are unsure. | 791 | Say N if you are unsure. |
792 | 792 | ||
793 | config DEBUG_FORCE_WEAK_PER_CPU | ||
794 | bool "Force weak per-cpu definitions" | ||
795 | depends on DEBUG_KERNEL | ||
796 | help | ||
797 | s390 and alpha require percpu variables in modules to be | ||
798 | defined weak to work around addressing range issue which | ||
799 | puts the following two restrictions on percpu variable | ||
800 | definitions. | ||
801 | |||
802 | 1. percpu symbols must be unique whether static or not | ||
803 | 2. percpu variables can't be defined inside a function | ||
804 | |||
805 | To ensure that generic code follows the above rules, this | ||
806 | option forces all percpu variables to be defined as weak. | ||
807 | |||
793 | config LKDTM | 808 | config LKDTM |
794 | tristate "Linux Kernel Dump Test Tool Module" | 809 | tristate "Linux Kernel Dump Test Tool Module" |
795 | depends on DEBUG_KERNEL | 810 | depends on DEBUG_KERNEL |