aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig22
-rw-r--r--init/Makefile3
2 files changed, 22 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 05a75c4f5ce2..d5a1a1228fab 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -77,6 +77,22 @@ config LOCALVERSION
77 object and source tree, in that order. Your total string can 77 object and source tree, in that order. Your total string can
78 be a maximum of 64 characters. 78 be a maximum of 64 characters.
79 79
80config LOCALVERSION_AUTO
81 bool "Automatically append version information to the version string"
82 default y
83 help
84 This will try to automatically determine if the current tree is a
85 release tree by looking for git tags that
86 belong to the current top of tree revision.
87
88 A string of the format -gxxxxxxxx will be added to the localversion
89 if a git based tree is found. The string generated by this will be
90 appended after any matching localversion* files, and after the value
91 set in CONFIG_LOCALVERSION
92
93 Note: This requires Perl, and a git repository, but not necessarily
94 the git or cogito tools to be installed.
95
80config SWAP 96config SWAP
81 bool "Support for paging of anonymous memory (swap)" 97 bool "Support for paging of anonymous memory (swap)"
82 depends on MMU 98 depends on MMU
@@ -238,6 +254,8 @@ config CPUSETS
238 254
239 Say N if unsure. 255 Say N if unsure.
240 256
257source "usr/Kconfig"
258
241menuconfig EMBEDDED 259menuconfig EMBEDDED
242 bool "Configure standard kernel features (for small systems)" 260 bool "Configure standard kernel features (for small systems)"
243 help 261 help
@@ -260,8 +278,8 @@ config KALLSYMS_ALL
260 help 278 help
261 Normally kallsyms only contains the symbols of functions, for nicer 279 Normally kallsyms only contains the symbols of functions, for nicer
262 OOPS messages. Some debuggers can use kallsyms for other 280 OOPS messages. Some debuggers can use kallsyms for other
263 symbols too: say Y here to include all symbols, and you 281 symbols too: say Y here to include all symbols, if you need them
264 don't care about adding 300k to the size of your kernel. 282 and you don't care about adding 300k to the size of your kernel.
265 283
266 Say N. 284 Say N.
267 285
diff --git a/init/Makefile b/init/Makefile
index 93a53fbdbe79..a2300078f2b7 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -25,4 +25,5 @@ $(obj)/version.o: include/linux/compile.h
25 25
26include/linux/compile.h: FORCE 26include/linux/compile.h: FORCE
27 @echo ' CHK $@' 27 @echo ' CHK $@'
28 @$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CC) $(CFLAGS)" 28 $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
29 "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(CFLAGS)"