Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit b6e3cb4e8679 · 2019-03-10T14:44:35.000-07:00
Pull x86 boot fix from Thomas Gleixner:
 "A trivial fix for the previous x86/boot pull request which did not
  make it in time"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/boot/KASLR: Always return a value from process_mem_region
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -697,8 +697,8 @@ static bool process_mem_region(struct mem_vector *region,`
`697`	`697`	`return 1;`
`698`	`698`	`}`
`699`	`699`	`}`
`700`		`- return 0;`
`701`	`700`	`#endif`
	`701`	`+ return 0;`
`702`	`702`	`}`
`703`	`703`
`704`	`704`	`#ifdef CONFIG_EFI`