[PATCH 1/1] x86/boot/compressed: Fix avoiding memmap in physical KASLR

[Michal Clapinski]

The intent of the code was to cancel KASLR if there are more than 4
memmap args. Unfortunately, it was only doing that if the memmap args
were comma delimited, not if they were entirely separate.
This change fixes it.

Signed-off-by: Michal Clapinski <mclapinski@xxxxxxxxxx>
---
I would like KASLR to support more than 4 memmap args. Do you think
I can just increase the MAX_MEMMAP_REGIONS or should I implement
support for the general case?

 arch/x86/boot/compressed/kaslr.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
index f03d59ea6e40..4aa9c9781ca7 100644
--- a/arch/x86/boot/compressed/kaslr.c
+++ b/arch/x86/boot/compressed/kaslr.c
@@ -162,9 +162,6 @@ static void mem_avoid_memmap(char *str)
 {
 	static int i;
 
-	if (i >= MAX_MEMMAP_REGIONS)
-		return;
-
 	while (str && (i < MAX_MEMMAP_REGIONS)) {
 		int rc;
 		u64 start, size;
-- 
2.50.0.rc0.642.g800a2b2222-goog