projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d6d0f36
)
x86/kaslr: Drop redundant check in store_slot_info()
author
Arvind Sankar
<nivedita@alum.mit.edu>
Tue, 28 Jul 2020 22:57:16 +0000
(18:57 -0400)
committer
Ingo Molnar
<mingo@kernel.org>
Fri, 31 Jul 2020 09:08:17 +0000
(11:08 +0200)
Drop unnecessary check that number of slots is not zero in
store_slot_info, it's guaranteed to be at least 1 by the calculation.
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link:
https://lore.kernel.org/r/20200728225722.67457-16-nivedita@alum.mit.edu
arch/x86/boot/compressed/kaslr.c
patch
|
blob
|
history
diff --git
a/arch/x86/boot/compressed/kaslr.c
b/arch/x86/boot/compressed/kaslr.c
index
5c7457c
..
0c64026
100644
(file)
--- a/
arch/x86/boot/compressed/kaslr.c
+++ b/
arch/x86/boot/compressed/kaslr.c
@@
-525,13
+525,10
@@
static void store_slot_info(struct mem_vector *region, unsigned long image_size)
return;
slot_area.addr = region->start;
- slot_area.num = (region->size - image_size) /
- CONFIG_PHYSICAL_ALIGN + 1;
+ slot_area.num = 1 + (region->size - image_size) / CONFIG_PHYSICAL_ALIGN;
- if (slot_area.num > 0) {
- slot_areas[slot_area_index++] = slot_area;
- slot_max += slot_area.num;
- }
+ slot_areas[slot_area_index++] = slot_area;
+ slot_max += slot_area.num;
}
/*