Commit b6e3cb4e authored by Linus Torvalds's avatar Linus Torvalds

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
parents a15f6b92 e4a0bd03
...@@ -697,8 +697,8 @@ static bool process_mem_region(struct mem_vector *region, ...@@ -697,8 +697,8 @@ static bool process_mem_region(struct mem_vector *region,
return 1; return 1;
} }
} }
return 0;
#endif #endif
return 0;
} }
#ifdef CONFIG_EFI #ifdef CONFIG_EFI
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment