diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-06-27 11:20:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-27 11:20:46 +0200 |
| commit | 8114e90ea4deafc7c75c7b343225b485c21b6706 (patch) | |
| tree | 046c9cd4967e2ea56eab9dcaf6ca6f601fa3deda /arch/Kconfig | |
| parent | 9840b1ae45876bcca41b64007ac4a56a7cd14c73 (diff) | |
| parent | 4c2e07c6a29e0129e975727b9f57eede813eea85 (diff) | |
| download | linux-stable-8114e90ea4deafc7c75c7b343225b485c21b6706.tar.gz linux-stable-8114e90ea4deafc7c75c7b343225b485c21b6706.tar.bz2 linux-stable-8114e90ea4deafc7c75c7b343225b485c21b6706.zip | |
Merge tag 'v4.7-rc5' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/Kconfig')
| -rw-r--r-- | arch/Kconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index d794384a0404..15996290fed4 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -226,8 +226,8 @@ config ARCH_INIT_TASK config ARCH_TASK_STRUCT_ALLOCATOR bool -# Select if arch has its private alloc_thread_info() function -config ARCH_THREAD_INFO_ALLOCATOR +# Select if arch has its private alloc_thread_stack() function +config ARCH_THREAD_STACK_ALLOCATOR bool # Select if arch wants to size task_struct dynamically via arch_task_struct_size: @@ -606,6 +606,9 @@ config HAVE_ARCH_HASH file which provides platform-specific implementations of some functions in <linux/hash.h> or fs/namei.c. +config ISA_BUS_API + def_bool ISA + # # ABI hall of shame # |