x86/boot/KASLR: Always return a value from process_mem_region

kragniz · KAGA-KOKO · commit e4a0bd0308f0 · 2019-03-06T22:55:30.000+01:00
When compiling with -Wreturn-type, clang warns: arch/x86/boot/compressed/kaslr.c:704:1: warning: control may reach end of non-void function [-Wreturn-type] This function's return statement should have been placed outside the ifdeffed region. Move it there. Fixes: 690eaa5 ("x86/boot/KASLR: Limit KASLR to extract the kernel in immovable memory only") Signed-off-by: Louis Taylor <louis@kragniz.eu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Cc: bp@alien8.de Cc: hpa@zytor.com Cc: fanc.fnst@cn.fujitsu.com Cc: bhe@redhat.com Cc: kirill.shutemov@linux.intel.com Cc: jflat@chromium.org Link: https://lkml.kernel.org/r/20190302184929.28971-1-louis@kragniz.eu
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`