diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 11:08:42 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 11:08:42 -0400 |
| commit | 7203781c98ad9147564d327de6f6513ad8fc0f4e (patch) | |
| tree | 5c29a2a04a626bf08a0d56fd8a0068b3c92ad284 /init/Kconfig | |
| parent | 671eef85a3e885dff4ce210d8774ad50a91d5967 (diff) | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 (diff) | |
Merge branch 'x86/cpu' into x86/core
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/init/Kconfig b/init/Kconfig index b678803deccf..c11da38837e5 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -558,17 +558,6 @@ config SYSCTL_SYSCALL | |||
| 558 | 558 | ||
| 559 | If unsure say Y here. | 559 | If unsure say Y here. |
| 560 | 560 | ||
| 561 | config SYSCTL_SYSCALL_CHECK | ||
| 562 | bool "Sysctl checks" if EMBEDDED | ||
| 563 | depends on SYSCTL_SYSCALL | ||
| 564 | default y | ||
| 565 | ---help--- | ||
| 566 | sys_sysctl uses binary paths that have been found challenging | ||
| 567 | to properly maintain and use. This enables checks that help | ||
| 568 | you to keep things correct. | ||
| 569 | |||
| 570 | If unsure say Y here. | ||
| 571 | |||
| 572 | config KALLSYMS | 561 | config KALLSYMS |
| 573 | bool "Load all symbols for debugging/ksymoops" if EMBEDDED | 562 | bool "Load all symbols for debugging/ksymoops" if EMBEDDED |
| 574 | default y | 563 | default y |