projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[deliverable/linux.git]
/
arch
/
Kconfig
diff --git
a/arch/Kconfig
b/arch/Kconfig
index 81869a5e7e174ae470ba7746d88f8cdb35065c36..b16e74e4b5afbbcfad4091c4067c638d2e50da3c 100644
(file)
--- a/
arch/Kconfig
+++ b/
arch/Kconfig
@@
-187,7
+187,11
@@
config HAVE_OPTPROBES
config HAVE_KPROBES_ON_FTRACE
bool
config HAVE_KPROBES_ON_FTRACE
bool
+config HAVE_NMI
+ bool
+
config HAVE_NMI_WATCHDOG
config HAVE_NMI_WATCHDOG
+ depends on HAVE_NMI
bool
#
# An arch should select this if it provides all these things:
bool
#
# An arch should select this if it provides all these things:
@@
-517,6
+521,11
@@
config HAVE_ARCH_MMAP_RND_BITS
- ARCH_MMAP_RND_BITS_MIN
- ARCH_MMAP_RND_BITS_MAX
- ARCH_MMAP_RND_BITS_MIN
- ARCH_MMAP_RND_BITS_MAX
+config HAVE_EXIT_THREAD
+ bool
+ help
+ An architecture implements exit_thread.
+
config ARCH_MMAP_RND_BITS_MIN
int
config ARCH_MMAP_RND_BITS_MIN
int
@@
-638,4
+647,7
@@
config COMPAT_OLD_SIGACTION
config ARCH_NO_COHERENT_DMA_MMAP
bool
config ARCH_NO_COHERENT_DMA_MMAP
bool
+config CPU_NO_EFFICIENT_FFS
+ def_bool n
+
source "kernel/gcov/Kconfig"
source "kernel/gcov/Kconfig"
This page took
0.030387 seconds
and
5
git commands to generate.