[GIT pull] x86/boot fix for 5.1

From: Thomas Gleixner
Date: Sun Mar 10 2019 - 07:34:04 EST


Linus,

please pull the latest x86-boot-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-boot-for-linus

A trivial fix for the previous x86/boot pull request which did not make it
in time.

Thanks,

tglx

------------------>
Louis Taylor (1):
x86/boot/KASLR: Always return a value from process_mem_region


arch/x86/boot/compressed/kaslr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
index fa0332dda9f2..2e53c056ba20 100644
--- a/arch/x86/boot/compressed/kaslr.c
+++ b/arch/x86/boot/compressed/kaslr.c
@@ -697,8 +697,8 @@ static bool process_mem_region(struct mem_vector *region,
return 1;
}
}
- return 0;
#endif
+ return 0;
}

#ifdef CONFIG_EFI