summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-03-10 14:44:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-03-10 14:44:35 -0700
commitb6e3cb4e8679dd971eed33f6a08d62c66a4230c9 (patch)
tree47b7f596cd806496ce3b57b2ab807ea781ffcab8 /arch
parenta15f6b923e1e1040edc79f222d5d229ea8097259 (diff)
parente4a0bd0308f05c1354d28feec8439e869eae6372 (diff)
Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/boot/compressed/kaslr.c2
1 files changed, 1 insertions, 1 deletions
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