Commit 3f9412c7 authored by Arvind Sankar's avatar Arvind Sankar Committed by Ingo Molnar

x86/kaslr: Drop redundant cur_entry from __process_mem_region()

cur_entry is only used as cur_entry.start + cur_entry.size, which is
always equal to end.
Signed-off-by: default avatarArvind Sankar <nivedita@alum.mit.edu>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200728225722.67457-7-nivedita@alum.mit.edu
parent 8d1cf859
...@@ -624,7 +624,6 @@ static void __process_mem_region(struct mem_vector *entry, ...@@ -624,7 +624,6 @@ static void __process_mem_region(struct mem_vector *entry,
{ {
struct mem_vector region, overlap; struct mem_vector region, overlap;
unsigned long start_orig, end; unsigned long start_orig, end;
struct mem_vector cur_entry;
/* Ignore entries entirely below our minimum. */ /* Ignore entries entirely below our minimum. */
if (entry->start + entry->size < minimum) if (entry->start + entry->size < minimum)
...@@ -634,11 +633,9 @@ static void __process_mem_region(struct mem_vector *entry, ...@@ -634,11 +633,9 @@ static void __process_mem_region(struct mem_vector *entry,
end = min(entry->size + entry->start, mem_limit); end = min(entry->size + entry->start, mem_limit);
if (entry->start >= end) if (entry->start >= end)
return; return;
cur_entry.start = entry->start;
cur_entry.size = end - entry->start;
region.start = cur_entry.start; region.start = entry->start;
region.size = cur_entry.size; region.size = end - entry->start;
/* Give up if slot area array is full. */ /* Give up if slot area array is full. */
while (slot_area_index < MAX_SLOT_AREA) { while (slot_area_index < MAX_SLOT_AREA) {
...@@ -652,7 +649,7 @@ static void __process_mem_region(struct mem_vector *entry, ...@@ -652,7 +649,7 @@ static void __process_mem_region(struct mem_vector *entry,
region.start = ALIGN(region.start, CONFIG_PHYSICAL_ALIGN); region.start = ALIGN(region.start, CONFIG_PHYSICAL_ALIGN);
/* Did we raise the address above the passed in memory entry? */ /* Did we raise the address above the passed in memory entry? */
if (region.start > cur_entry.start + cur_entry.size) if (region.start > end)
return; return;
/* Reduce size by any delta from the original address. */ /* Reduce size by any delta from the original address. */
......
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