Ard Biesheuvel wrote: > Commit 60f38de7a8d4e816100ceafd1b382df52527bd50 upstream. > > Merge the parsing of the command line carried out in arm-stub.c with > the handling in efi_parse_options(). Note that this also fixes the > missing handling of CONFIG_CMDLINE_FORCE=y, in which case the builtin > command line should supersede the one passed by the firmware. > > Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org> > Cc: Linus Torvalds <torva...@linux-foundation.org> > Cc: Matt Fleming <m...@codeblueprint.co.uk> > Cc: Peter Zijlstra <pet...@infradead.org> > Cc: Thomas Gleixner <t...@linutronix.de> > Cc: b...@redhat.com > Cc: bhsha...@redhat.com > Cc: b...@alien8.de > Cc: eug...@hp.com > Cc: evgeny.kalu...@intel.com > Cc: jh...@codeaurora.org > Cc: leif.lindh...@linaro.org > Cc: linux-efi@vger.kernel.org > Cc: mark.rutl...@arm.com > Cc: roy.fr...@cavium.com > Cc: rruig...@codeaurora.org > Link: > http://lkml.kernel.org/r/20170404160910.28115-1-ard.biesheu...@linaro.org > Signed-off-by: Ingo Molnar <mi...@kernel.org> > [ardb: fix up merge conflicts with 4.9.180] > Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org> > --- > This fixes the GCC build issue reported by Eike. > > Note that testing of arm64 stable kernels should cover > CONFIG_RANDOMIZE_BASE, since it has a profound impact on how the kernel > binary gets put together.
Confirmed, this patch works for me on top of 4.9.180. -- Rolf Eike Beer, emlix GmbH, http://www.emlix.com Fon +49 551 30664-0, Fax +49 551 30664-11 Gothaer Platz 3, 37083 Göttingen, Germany Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160 Geschäftsführung: Heike Jordan, Dr. Uwe Kracke – Ust-IdNr.: DE 205 198 055 emlix - smart embedded open source
signature.asc
Description: This is a digitally signed message part.
