diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 14:12:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-14 14:12:18 -0700 |
| commit | 45e3e1935e2857c54783291107d33323b3ef33c8 (patch) | |
| tree | 26a6e3228b52d0f96f6e56e5879ca898fe909592 /init/Kconfig | |
| parent | cf5046323ea254be72535648a9d090b18b8510f3 (diff) | |
| parent | 3f8d9ced7746f3f329ccca0bb3f3c7a2c15c47bb (diff) | |
| download | kernel_samsung_espresso10-45e3e1935e2857c54783291107d33323b3ef33c8.zip kernel_samsung_espresso10-45e3e1935e2857c54783291107d33323b3ef33c8.tar.gz kernel_samsung_espresso10-45e3e1935e2857c54783291107d33323b3ef33c8.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (53 commits)
.gitignore: ignore *.lzma files
kbuild: add generic --set-str option to scripts/config
kbuild: simplify argument loop in scripts/config
kbuild: handle non-existing options in scripts/config
kallsyms: generalize text region handling
kallsyms: support kernel symbols in Blackfin on-chip memory
documentation: make version fix
kbuild: fix a compile warning
gitignore: Add GNU GLOBAL files to top .gitignore
kbuild: fix delay in setlocalversion on readonly source
README: fix misleading pointer to the defconf directory
vmlinux.lds.h update
kernel-doc: cleanup perl script
Improve vmlinux.lds.h support for arch specific linker scripts
kbuild: fix headers_exports with boolean expression
kbuild/headers_check: refine extern check
kbuild: fix "Argument list too long" error for "make headers_check",
ignore *.patch files
Remove bashisms from scripts
menu: fix embedded menu presentation
...
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/init/Kconfig b/init/Kconfig index d3a5096..fed6dc3 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -809,14 +809,6 @@ config KALLSYMS_EXTRA_PASS you wait for kallsyms to be fixed. -config STRIP_ASM_SYMS - bool "Strip assembler-generated symbols during link" - default n - help - Strip internal assembler-generated symbols during a link (symbols - that look like '.Lxxx') so they don't pollute the output of - get_wchan() and suchlike. - config HOTPLUG bool "Support for hot-pluggable devices" if EMBEDDED default y @@ -998,6 +990,14 @@ config SLUB_DEBUG SLUB sysfs support. /sys/slab will not exist and there will be no support for cache validation etc. +config STRIP_ASM_SYMS + bool "Strip assembler-generated symbols during link" + default n + help + Strip internal assembler-generated symbols during a link (symbols + that look like '.Lxxx') so they don't pollute the output of + get_wchan() and suchlike. + config COMPAT_BRK bool "Disable heap randomization" default y |