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.biesheuvel@xxxxxxxxxx> > Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> > Cc: Matt Fleming <matt@xxxxxxxxxxxxxxxxxxx> > Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > Cc: bhe@xxxxxxxxxx > Cc: bhsharma@xxxxxxxxxx > Cc: bp@xxxxxxxxx > Cc: eugene@xxxxxx > Cc: evgeny.kalugin@xxxxxxxxx > Cc: jhugo@xxxxxxxxxxxxxx > Cc: leif.lindholm@xxxxxxxxxx > Cc: linux-efi@xxxxxxxxxxxxxxx > Cc: mark.rutland@xxxxxxx > Cc: roy.franz@xxxxxxxxxx > Cc: rruigrok@xxxxxxxxxxxxxx > Link: > http://lkml.kernel.org/r/20170404160910.28115-1-ard.biesheuvel@xxxxxxxxxx > Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> > [ardb: fix up merge conflicts with 4.9.180] > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> > --- > 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
Attachment:
signature.asc
Description: This is a digitally signed message part.
