Skip to content

Commit eea78dc

Browse files
committed
x86/boot/e820: Use 'u64' consistently instead of 'unsigned long long'
There's a number of structure fields and local variables related to E820 entry physical addresses that are defined as 'unsigned long long', but then are compared to u64 fields. Make the types all consistently u64. Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Andy Shevchenko <andy@kernel.org> Cc: Arnd Bergmann <arnd@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Juergen Gross <jgross@suse.com> Cc: "H . Peter Anvin" <hpa@zytor.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> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: David Woodhouse <dwmw@amazon.co.uk> Link: https://patch.msgid.link/20250515120549.2820541-11-mingo@kernel.org
1 parent 1d7bc21 commit eea78dc

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

arch/x86/kernel/e820.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ struct change_member {
296296
/* Pointer to the original entry: */
297297
struct e820_entry *entry;
298298
/* Address for this change point: */
299-
unsigned long long addr;
299+
u64 addr;
300300
};
301301

302302
static struct change_member change_point_list[2*E820_MAX_ENTRIES] __initdata;
@@ -344,7 +344,7 @@ int __init e820__update_table(struct e820_table *table)
344344
struct e820_entry *entries = table->entries;
345345
u32 max_nr_entries = ARRAY_SIZE(table->entries);
346346
enum e820_type current_type, last_type;
347-
unsigned long long last_addr;
347+
u64 last_addr;
348348
u32 new_nr_entries, overlap_entries;
349349
u32 i, chg_idx, chg_nr;
350350

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

648648
while (--i >= 0) {
649-
unsigned long long start = e820_table->entries[i].addr;
650-
unsigned long long end = start + e820_table->entries[i].size;
649+
u64 start = e820_table->entries[i].addr;
650+
u64 end = start + e820_table->entries[i].size;
651651

652652
/*
653653
* Since "last" is at most 4GB, we know we'll

0 commit comments

Comments
 (0)