]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
x86/efi: Fix kernel param add_efi_memmap regression
authorDave Young <dyoung@redhat.com>
Tue, 2 Jan 2018 17:21:09 +0000 (17:21 +0000)
committerIngo Molnar <mingo@kernel.org>
Wed, 3 Jan 2018 12:54:31 +0000 (13:54 +0100)
commit835bcec5fdf3f9e880111b482177e7e70e3596da
tree3b51709f605b78c93884d884b43d185fab3c5d2e
parent30a7acd573899fd8b8ac39236eff6468b195ac7d
x86/efi: Fix kernel param add_efi_memmap regression

'add_efi_memmap' is an early param, but do_add_efi_memmap() has no
chance to run because the code path is before parse_early_param().
I believe it worked when the param was introduced but probably later
some other changes caused the wrong order and nobody noticed it.

Move efi_memblock_x86_reserve_range() after parse_early_param()
to fix it.

Signed-off-by: Dave Young <dyoung@redhat.com>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Bryan O'Donoghue <pure.logic@nexus-software.ie>
Cc: Ge Song <ge.song@hxt-semitech.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20180102172110.17018-2-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/setup.c