Skip to content

Commit dc043d6

Browse files
ingomolnaringomolnar
committed
x86/boot/e820: Standardize e820 table index variable names under 'idx'
Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Andy Shevchenko <andy@kernel.org> Cc: Arnd Bergmann <arnd@kernel.org> Cc: David Woodhouse <dwmw@amazon.co.uk> Cc: H . Peter Anvin <hpa@zytor.com> 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-18-mingo@kernel.org
1 parent a515ca9 commit dc043d6

1 file changed

Lines changed: 57 additions & 57 deletions

File tree

‎arch/x86/kernel/e820.c‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ EXPORT_SYMBOL(pci_mem_start);
7676
static bool _e820__mapped_any(struct e820_table *table,
7777
u64 start, u64 end, enum e820_type type)
7878
{
79-
int i;
79+
int idx;
8080

81-
for (i = 0; i < table->nr_entries; i++) {
82-
struct e820_entry *entry = &table->entries[i];
81+
for (idx = 0; idx < table->nr_entries; idx++) {
82+
struct e820_entry *entry = &table->entries[idx];
8383

8484
if (type && entry->type != type)
8585
continue;
@@ -111,10 +111,10 @@ EXPORT_SYMBOL_GPL(e820__mapped_any);
111111
static struct e820_entry *__e820__mapped_all(u64 start, u64 end,
112112
enum e820_type type)
113113
{
114-
int i;
114+
int idx;
115115

116-
for (i = 0; i < e820_table->nr_entries; i++) {
117-
struct e820_entry *entry = &e820_table->entries[i];
116+
for (idx = 0; idx < e820_table->nr_entries; idx++) {
117+
struct e820_entry *entry = &e820_table->entries[idx];
118118

119119
if (type && entry->type != type)
120120
continue;
@@ -202,10 +202,10 @@ static void __init e820_print_type(enum e820_type type)
202202
static void __init e820__print_table(const char *who)
203203
{
204204
u64 range_end_prev = 0;
205-
int i;
205+
int idx;
206206

207-
for (i = 0; i < e820_table->nr_entries; i++) {
208-
struct e820_entry *entry = e820_table->entries + i;
207+
for (idx = 0; idx < e820_table->nr_entries; idx++) {
208+
struct e820_entry *entry = e820_table->entries + idx;
209209
u64 range_start, range_end;
210210

211211
range_start = entry->addr;
@@ -345,7 +345,7 @@ int __init e820__update_table(struct e820_table *table)
345345
enum e820_type current_type, last_type;
346346
u64 last_addr;
347347
u32 new_nr_entries, overlap_entries;
348-
u32 i, chg_idx, chg_nr;
348+
u32 idx, chg_idx, chg_nr;
349349

350350
/* If there's only one memory region, don't bother: */
351351
if (table->nr_entries < 2)
@@ -354,26 +354,26 @@ int __init e820__update_table(struct e820_table *table)
354354
BUG_ON(table->nr_entries > max_nr_entries);
355355

356356
/* Bail out if we find any unreasonable addresses in the map: */
357-
for (i = 0; i < table->nr_entries; i++) {
358-
if (entries[i].addr + entries[i].size < entries[i].addr)
357+
for (idx = 0; idx < table->nr_entries; idx++) {
358+
if (entries[idx].addr + entries[idx].size < entries[idx].addr)
359359
return -1;
360360
}
361361

362362
/* Create pointers for initial change-point information (for sorting): */
363-
for (i = 0; i < 2 * table->nr_entries; i++)
364-
change_point[i] = &change_point_list[i];
363+
for (idx = 0; idx < 2 * table->nr_entries; idx++)
364+
change_point[idx] = &change_point_list[idx];
365365

366366
/*
367367
* Record all known change-points (starting and ending addresses),
368368
* omitting empty memory regions:
369369
*/
370370
chg_idx = 0;
371-
for (i = 0; i < table->nr_entries; i++) {
372-
if (entries[i].size != 0) {
373-
change_point[chg_idx]->addr = entries[i].addr;
374-
change_point[chg_idx++]->entry = &entries[i];
375-
change_point[chg_idx]->addr = entries[i].addr + entries[i].size;
376-
change_point[chg_idx++]->entry = &entries[i];
371+
for (idx = 0; idx < table->nr_entries; idx++) {
372+
if (entries[idx].size != 0) {
373+
change_point[chg_idx]->addr = entries[idx].addr;
374+
change_point[chg_idx++]->entry = &entries[idx];
375+
change_point[chg_idx]->addr = entries[idx].addr + entries[idx].size;
376+
change_point[chg_idx++]->entry = &entries[idx];
377377
}
378378
}
379379
chg_nr = chg_idx;
@@ -395,9 +395,9 @@ int __init e820__update_table(struct e820_table *table)
395395
overlap_list[overlap_entries++] = change_point[chg_idx]->entry;
396396
} else {
397397
/* Remove entry from list (order independent, so swap with last): */
398-
for (i = 0; i < overlap_entries; i++) {
399-
if (overlap_list[i] == change_point[chg_idx]->entry)
400-
overlap_list[i] = overlap_list[overlap_entries-1];
398+
for (idx = 0; idx < overlap_entries; idx++) {
399+
if (overlap_list[idx] == change_point[chg_idx]->entry)
400+
overlap_list[idx] = overlap_list[overlap_entries-1];
401401
}
402402
overlap_entries--;
403403
}
@@ -407,9 +407,9 @@ int __init e820__update_table(struct e820_table *table)
407407
* 1=usable, 2,3,4,4+=unusable)
408408
*/
409409
current_type = 0;
410-
for (i = 0; i < overlap_entries; i++) {
411-
if (overlap_list[i]->type > current_type)
412-
current_type = overlap_list[i]->type;
410+
for (idx = 0; idx < overlap_entries; idx++) {
411+
if (overlap_list[idx]->type > current_type)
412+
current_type = overlap_list[idx]->type;
413413
}
414414

415415
/* Continue building up new map based on this information: */
@@ -482,7 +482,7 @@ static u64 __init
482482
__e820__range_update(struct e820_table *table, u64 start, u64 size, enum e820_type old_type, enum e820_type new_type)
483483
{
484484
u64 end;
485-
unsigned int i;
485+
unsigned int idx;
486486
u64 real_updated_size = 0;
487487

488488
BUG_ON(old_type == new_type);
@@ -497,8 +497,8 @@ __e820__range_update(struct e820_table *table, u64 start, u64 size, enum e820_ty
497497
e820_print_type(new_type);
498498
pr_cont("\n");
499499

500-
for (i = 0; i < table->nr_entries; i++) {
501-
struct e820_entry *entry = &table->entries[i];
500+
for (idx = 0; idx < table->nr_entries; idx++) {
501+
struct e820_entry *entry = &table->entries[idx];
502502
u64 final_start, final_end;
503503
u64 entry_end;
504504

@@ -560,7 +560,7 @@ u64 __init e820__range_update_table(struct e820_table *t, u64 start, u64 size,
560560
/* Remove a range of memory from the E820 table: */
561561
u64 __init e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool check_type)
562562
{
563-
int i;
563+
int idx;
564564
u64 end;
565565
u64 real_removed_size = 0;
566566

@@ -573,8 +573,8 @@ u64 __init e820__range_remove(u64 start, u64 size, enum e820_type old_type, bool
573573
e820_print_type(old_type);
574574
pr_cont("\n");
575575

576-
for (i = 0; i < e820_table->nr_entries; i++) {
577-
struct e820_entry *entry = &e820_table->entries[i];
576+
for (idx = 0; idx < e820_table->nr_entries; idx++) {
577+
struct e820_entry *entry = &e820_table->entries[idx];
578578
u64 final_start, final_end;
579579
u64 entry_end;
580580

@@ -641,12 +641,12 @@ static void __init e820__update_table_kexec(void)
641641
static int __init e820_search_gap(unsigned long *gapstart, unsigned long *gapsize)
642642
{
643643
u64 last = MAX_GAP_END;
644-
int i = e820_table->nr_entries;
644+
int idx = e820_table->nr_entries;
645645
int found = 0;
646646

647-
while (--i >= 0) {
648-
u64 start = e820_table->entries[i].addr;
649-
u64 end = start + e820_table->entries[i].size;
647+
while (--idx >= 0) {
648+
u64 start = e820_table->entries[idx].addr;
649+
u64 end = start + e820_table->entries[idx].size;
650650

651651
/*
652652
* Since "last" is at most 4GB, we know we'll
@@ -772,11 +772,11 @@ void __init e820__memory_setup_extended(u64 phys_addr, u32 data_len)
772772
*/
773773
void __init e820__register_nosave_regions(unsigned long limit_pfn)
774774
{
775-
int i;
775+
int idx;
776776
u64 last_addr = 0;
777777

778-
for (i = 0; i < e820_table->nr_entries; i++) {
779-
struct e820_entry *entry = &e820_table->entries[i];
778+
for (idx = 0; idx < e820_table->nr_entries; idx++) {
779+
struct e820_entry *entry = &e820_table->entries[idx];
780780

781781
if (entry->type != E820_TYPE_RAM)
782782
continue;
@@ -797,10 +797,10 @@ void __init e820__register_nosave_regions(unsigned long limit_pfn)
797797
*/
798798
static int __init e820__register_nvs_regions(void)
799799
{
800-
int i;
800+
int idx;
801801

802-
for (i = 0; i < e820_table->nr_entries; i++) {
803-
struct e820_entry *entry = &e820_table->entries[i];
802+
for (idx = 0; idx < e820_table->nr_entries; idx++) {
803+
struct e820_entry *entry = &e820_table->entries[idx];
804804

805805
if (entry->type == E820_TYPE_NVS)
806806
acpi_nvs_register(entry->addr, entry->size);
@@ -848,12 +848,12 @@ u64 __init e820__memblock_alloc_reserved(u64 size, u64 align)
848848
*/
849849
static unsigned long __init e820__end_ram_pfn(unsigned long limit_pfn)
850850
{
851-
int i;
851+
int idx;
852852
unsigned long last_pfn = 0;
853853
unsigned long max_arch_pfn = MAX_ARCH_PFN;
854854

855-
for (i = 0; i < e820_table->nr_entries; i++) {
856-
struct e820_entry *entry = &e820_table->entries[i];
855+
for (idx = 0; idx < e820_table->nr_entries; idx++) {
856+
struct e820_entry *entry = &e820_table->entries[idx];
857857
unsigned long start_pfn;
858858
unsigned long end_pfn;
859859

@@ -1103,16 +1103,16 @@ static bool __init e820_device_region(enum e820_type type, struct resource *res)
11031103
*/
11041104
void __init e820__reserve_resources(void)
11051105
{
1106-
int i;
1106+
int idx;
11071107
struct resource *res;
11081108
u64 end;
11091109

11101110
res = memblock_alloc_or_panic(sizeof(*res) * e820_table->nr_entries,
11111111
SMP_CACHE_BYTES);
11121112
e820_res = res;
11131113

1114-
for (i = 0; i < e820_table->nr_entries; i++) {
1115-
struct e820_entry *entry = e820_table->entries + i;
1114+
for (idx = 0; idx < e820_table->nr_entries; idx++) {
1115+
struct e820_entry *entry = e820_table->entries + idx;
11161116

11171117
end = entry->addr + entry->size - 1;
11181118
if (end != (resource_size_t)end) {
@@ -1138,8 +1138,8 @@ void __init e820__reserve_resources(void)
11381138
}
11391139

11401140
/* Expose the kexec e820 table to sysfs: */
1141-
for (i = 0; i < e820_table_kexec->nr_entries; i++) {
1142-
struct e820_entry *entry = e820_table_kexec->entries + i;
1141+
for (idx = 0; idx < e820_table_kexec->nr_entries; idx++) {
1142+
struct e820_entry *entry = e820_table_kexec->entries + idx;
11431143

11441144
firmware_map_add_early(entry->addr, entry->addr + entry->size, e820_type_to_string(entry));
11451145
}
@@ -1168,15 +1168,15 @@ static unsigned long __init ram_alignment(resource_size_t pos)
11681168

11691169
void __init e820__reserve_resources_late(void)
11701170
{
1171-
int i;
1171+
int idx;
11721172
struct resource *res;
11731173

11741174
/*
11751175
* Register device address regions listed in the E820 map,
11761176
* these can be claimed by device drivers later on:
11771177
*/
11781178
res = e820_res;
1179-
for (i = 0; i < e820_table->nr_entries; i++) {
1179+
for (idx = 0; idx < e820_table->nr_entries; idx++) {
11801180
if (!res->parent && res->end)
11811181
insert_resource_expand_to_fit(&iomem_resource, res);
11821182
res++;
@@ -1194,8 +1194,8 @@ void __init e820__reserve_resources_late(void)
11941194
* doesn't properly list 'stolen RAM' as a system region
11951195
* in the E820 map.
11961196
*/
1197-
for (i = 0; i < e820_table->nr_entries; i++) {
1198-
struct e820_entry *entry = &e820_table->entries[i];
1197+
for (idx = 0; idx < e820_table->nr_entries; idx++) {
1198+
struct e820_entry *entry = &e820_table->entries[idx];
11991199
u64 start, end;
12001200

12011201
if (entry->type != E820_TYPE_RAM)
@@ -1272,7 +1272,7 @@ void __init e820__memory_setup(void)
12721272

12731273
void __init e820__memblock_setup(void)
12741274
{
1275-
int i;
1275+
int idx;
12761276
u64 end;
12771277

12781278
#ifdef CONFIG_MEMORY_HOTPLUG
@@ -1316,8 +1316,8 @@ void __init e820__memblock_setup(void)
13161316
*/
13171317
memblock_allow_resize();
13181318

1319-
for (i = 0; i < e820_table->nr_entries; i++) {
1320-
struct e820_entry *entry = &e820_table->entries[i];
1319+
for (idx = 0; idx < e820_table->nr_entries; idx++) {
1320+
struct e820_entry *entry = &e820_table->entries[idx];
13211321

13221322
end = entry->addr + entry->size;
13231323
if (end != (resource_size_t)end)

0 commit comments

Comments
 (0)