| Message ID | 1301999098-21412-2-git-send-email-dedekind1@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 2011-04-15 at 16:08 +0200, Michal Marek wrote: > I merged the patches, but removed the make help text. Rationale: People > who don't need it don't need the help text, for those that need it the > help text wouldn't provide more information than the error message. Is > this OK with you? Yes, fine, thank you!
On 5.4.2011 12:24, Artem Bityutskiy wrote: > From: Artem Bityutskiy<Artem.Bityutskiy@nokia.com> > > At the moment we have the CONFIG_KALLSYMS_EXTRA_PASS Kconfig switch, > which users can enable or disable while configuring the kernel. This > option is then used by 'make' to determine whether an extra kallsyms > pass is needed or not. > > However, this approach is not nice and confusing, and this patch moves > CONFIG_KALLSYMS_EXTRA_PASS from Kconfig to Makefile instead. The > rationale is below. > > 1. CONFIG_KALLSYMS_EXTRA_PASS is really about the build time, not > run-time. There is no real need for it to be in Kconfig. It is > just an additional work-around which should be used only in rare > cases, when someone breaks kallsyms, so Kbuild/Makefile is much > better place for this option. > 2. Grepping CONFIG_KALLSYMS_EXTRA_PASS shows that many defconfigs have > it enabled, probably not because they try to work-around a kallsyms > bug, but just because the Kconfig help text is confusing and does > not really make it clear that this option should not be used unless > except when kallsyms is broken. > 3. And since many people have CONFIG_KALLSYMS_EXTRA_PASS enabled in > their Kconfig, we do might fail to notice kallsyms bugs in time. E.g., > many testers use "make allyesconfig" to test builds, which will enable > CONFIG_KALLSYMS_EXTRA_PASS and kallsyms breakage will not be noticed. > > To address that, this patch: > > 1. Kills CONFIG_KALLSYMS_EXTRA_PASS > 2. Changes Makefile so that people can use "make KALLSYMS_EXTRA_PASS=1" > to enable the extra pass if needed. Additionally, they may define > KALLSYMS_EXTRA_PASS as an environment variable. > 3. By default KALLSYMS_EXTRA_PASS is disabled and if kallsyms has issues, > "make" should print a warning and suggest using KALLSYMS_EXTRA_PASS > 4. Add "make help" entry for KALLSYMS_EXTRA_PASS I merged the patches, but removed the make help text. Rationale: People who don't need it don't need the help text, for those that need it the help text wouldn't provide more information than the error message. Is this OK with you? Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Makefile b/Makefile index ba7a55c..58f8ab5 100644 --- a/Makefile +++ b/Makefile @@ -797,15 +797,17 @@ ifdef CONFIG_KALLSYMS # o The correct .tmp_kallsyms2.o is linked into the final vmlinux. # o Verify that the System.map from vmlinux matches the map from # .tmp_vmlinux2, just in case we did not generate kallsyms correctly. -# o If CONFIG_KALLSYMS_EXTRA_PASS is set, do an extra pass using +# o If 'make KALLSYMS_EXTRA_PASS=1" was used, do an extra pass using # .tmp_vmlinux3 and .tmp_kallsyms3.o. This is only meant as a # temporary bypass to allow the kernel to be built while the # maintainers work out what went wrong with kallsyms. -ifdef CONFIG_KALLSYMS_EXTRA_PASS -last_kallsyms := 3 -else last_kallsyms := 2 + +ifdef KALLSYMS_EXTRA_PASS +ifneq ($(KALLSYMS_EXTRA_PASS),0) +last_kallsyms := 3 +endif endif kallsyms.o := .tmp_kallsyms$(last_kallsyms).o @@ -816,7 +818,8 @@ define verify_kallsyms $(cmd_sysmap) .tmp_vmlinux$(last_kallsyms) .tmp_System.map $(Q)cmp -s System.map .tmp_System.map || \ (echo Inconsistent kallsyms data; \ - echo Try setting CONFIG_KALLSYMS_EXTRA_PASS; \ + echo This is a bug - please report about it; \ + echo Try "make KALLSYMS_EXTRA_PASS=1" as a workaround; \ rm .tmp_kallsyms* ; /bin/false ) endef @@ -1268,6 +1271,8 @@ help: @echo ' make C=1 [targets] Check all c source with $$CHECK (sparse by default)' @echo ' make C=2 [targets] Force check of all c source with $$CHECK' @echo ' make W=1 [targets] Enable extra gcc checks' + @echo ' make KALLSYMS_EXTRA_PASS=1 [targets] Temporary workaround for kallsyms bugs' + @echo ' (KALLSYMS_EXTRA_PASS may also be an environment variable)' @echo '' @echo 'Execute "make" or "make all" to build all targets marked with [*] ' @echo 'For further info see the ./README file' diff --git a/init/Kconfig b/init/Kconfig index 563065d..0edda61 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -981,18 +981,6 @@ config KALLSYMS_ALL Say N unless you really need all symbols. -config KALLSYMS_EXTRA_PASS - bool "Do an extra kallsyms pass" - depends on KALLSYMS - help - If kallsyms is not working correctly, the build will fail with - inconsistent kallsyms data. If that occurs, log a bug report and - turn on KALLSYMS_EXTRA_PASS which should result in a stable build. - Always say N here unless you find a bug in kallsyms, which must be - reported. KALLSYMS_EXTRA_PASS is only a temporary workaround while - you wait for kallsyms to be fixed. - - config HOTPLUG bool "Support for hot-pluggable devices" if EXPERT default y