Skip to content

Commit 8b886d8

Browse files
committed
x86/boot/e820: Remove e820__range_remove()'s unused return parameter
None of the usage sites make use of the 'real_removed_size' return parameter of e820__range_remove(), and it's hard to contemplate much constructive use: E820 maps can have holes, and removing a fixed range may result in removal of any number of bytes from 0 to the requested size. So remove this pointless calculation. This simplifies the function a bit: text data bss dec hex filename 7645 44072 0 51717 ca05 e820.o.before 7597 44072 0 51669 c9d5 e820.o.after Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: H . Peter Anvin <hpa@zytor.com> Cc: Andy Shevchenko <andy@kernel.org> Cc: Arnd Bergmann <arnd@kernel.org> Cc: David Woodhouse <dwmw@amazon.co.uk> Cc: Juergen Gross <jgross@suse.com> Cc: Kees Cook <keescook@chromium.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Rapoport <rppt@kernel.org> Cc: Paul Menzel <pmenzel@molgen.mpg.de> Cc: Peter Zijlstra <peterz@infradead.org> Link: https://patch.msgid.link/20250515120549.2820541-27-mingo@kernel.org
1 parent 157266e commit 8b886d8

2 files changed

Lines changed: 2 additions & 8 deletions

File tree

arch/x86/include/asm/e820/api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ extern bool e820__mapped_all(u64 start, u64 end, enum e820_type type);
1616

1717
extern void e820__range_add (u64 start, u64 size, enum e820_type type);
1818
extern u64 e820__range_update(u64 start, u64 size, enum e820_type old_type, enum e820_type new_type);
19-
extern u64 e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool check_type);
19+
extern void e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool check_type);
2020
extern u64 e820__range_update_table(struct e820_table *t, u64 start, u64 size, enum e820_type old_type, enum e820_type new_type);
2121

2222
extern int e820__update_table(struct e820_table *table);

arch/x86/kernel/e820.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -548,11 +548,10 @@ __init u64 e820__range_update_table(struct e820_table *t, u64 start, u64 size,
548548
}
549549

550550
/* Remove a range of memory from the E820 table: */
551-
__init u64 e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool check_type)
551+
__init void e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool check_type)
552552
{
553553
u32 idx;
554554
u64 end;
555-
u64 real_removed_size = 0;
556555

557556
if (size > (ULLONG_MAX - start))
558557
size = ULLONG_MAX - start;
@@ -575,7 +574,6 @@ __init u64 e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool
575574

576575
/* Completely covered? */
577576
if (entry->addr >= start && entry_end <= end) {
578-
real_removed_size += entry->size;
579577
memset(entry, 0, sizeof(*entry));
580578
continue;
581579
}
@@ -584,7 +582,6 @@ __init u64 e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool
584582
if (entry->addr < start && entry_end > end) {
585583
e820__range_add(end, entry_end - end, entry->type);
586584
entry->size = start - entry->addr;
587-
real_removed_size += size;
588585
continue;
589586
}
590587

@@ -594,8 +591,6 @@ __init u64 e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool
594591
if (final_start >= final_end)
595592
continue;
596593

597-
real_removed_size += final_end - final_start;
598-
599594
/*
600595
* Left range could be head or tail, so need to update
601596
* the size first:
@@ -606,7 +601,6 @@ __init u64 e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool
606601

607602
entry->addr = final_end;
608603
}
609-
return real_removed_size;
610604
}
611605

612606
__init void e820__update_table_print(void)

0 commit comments

Comments
 (0)