diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 11:22:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 11:22:43 -0400 |
| commit | d811f236d90e58c67092eaadacab609e76c38749 (patch) | |
| tree | 52b7d911948cf6a50f9a54abb6b91890ff9a8a72 /arch | |
| parent | 29a1e26febf4bd6eecab2a17a056c177d3627788 (diff) | |
| parent | 066123a535927b3f17cac2305258cc71abdb0d92 (diff) | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
percpu: unbreak alpha percpu
mutex: have non-spinning mutexes on s390 by default
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/Kconfig | 3 | ||||
| -rw-r--r-- | arch/s390/Kconfig | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index dc81b34c5d82..78a35e9dc104 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
| @@ -109,3 +109,6 @@ config HAVE_CLK | |||
| 109 | 109 | ||
| 110 | config HAVE_DMA_API_DEBUG | 110 | config HAVE_DMA_API_DEBUG |
| 111 | bool | 111 | bool |
| 112 | |||
| 113 | config HAVE_DEFAULT_NO_SPIN_MUTEXES | ||
| 114 | bool | ||
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index dcb667c4375a..2eca5fe0e75b 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
| @@ -82,6 +82,7 @@ config S390 | |||
| 82 | select USE_GENERIC_SMP_HELPERS if SMP | 82 | select USE_GENERIC_SMP_HELPERS if SMP |
| 83 | select HAVE_SYSCALL_WRAPPERS | 83 | select HAVE_SYSCALL_WRAPPERS |
| 84 | select HAVE_FUNCTION_TRACER | 84 | select HAVE_FUNCTION_TRACER |
| 85 | select HAVE_DEFAULT_NO_SPIN_MUTEXES | ||
| 85 | select HAVE_OPROFILE | 86 | select HAVE_OPROFILE |
| 86 | select HAVE_KPROBES | 87 | select HAVE_KPROBES |
| 87 | select HAVE_KRETPROBES | 88 | select HAVE_KRETPROBES |