Skip to content

Commit b6e3cb4

Browse files
committed
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
2 parents a15f6b9 + e4a0bd0 commit b6e3cb4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/boot/compressed/kaslr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,8 +697,8 @@ static bool process_mem_region(struct mem_vector *region,
697697
return 1;
698698
}
699699
}
700-
return 0;
701700
#endif
701+
return 0;
702702
}
703703

704704
#ifdef CONFIG_EFI

0 commit comments

Comments
 (0)