Skip to content

Commit 3a06699

Browse files
nivedita76ingomolnar
authored andcommitted
x86/kaslr: Replace 'unsigned long long' with 'u64'
No functional change. 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-20-nivedita@alum.mit.edu
1 parent e4cb955 commit 3a06699

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

arch/x86/boot/compressed/kaslr.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static bool memmap_too_large;
9898
* Store memory limit: MAXMEM on 64-bit and KERNEL_IMAGE_SIZE on 32-bit.
9999
* It may be reduced by "mem=nn[KMG]" or "memmap=nn[KMG]" command line options.
100100
*/
101-
static unsigned long long mem_limit;
101+
static u64 mem_limit;
102102

103103
/* Number of immovable memory regions */
104104
static int num_immovable_mem;
@@ -141,8 +141,7 @@ enum parse_mode {
141141
};
142142

143143
static int
144-
parse_memmap(char *p, unsigned long long *start, unsigned long long *size,
145-
enum parse_mode mode)
144+
parse_memmap(char *p, u64 *start, u64 *size, enum parse_mode mode)
146145
{
147146
char *oldp;
148147

@@ -172,7 +171,7 @@ parse_memmap(char *p, unsigned long long *start, unsigned long long *size,
172171
*/
173172
*size = 0;
174173
} else {
175-
unsigned long long flags;
174+
u64 flags;
176175

177176
/*
178177
* efi_fake_mem=nn@ss:attr the attr specifies
@@ -211,7 +210,7 @@ static void mem_avoid_memmap(enum parse_mode mode, char *str)
211210

212211
while (str && (i < MAX_MEMMAP_REGIONS)) {
213212
int rc;
214-
unsigned long long start, size;
213+
u64 start, size;
215214
char *k = strchr(str, ',');
216215

217216
if (k)
@@ -612,7 +611,7 @@ static void __process_mem_region(struct mem_vector *entry,
612611
unsigned long region_end;
613612

614613
/* Enforce minimum and memory limit. */
615-
region.start = max_t(unsigned long long, entry->start, minimum);
614+
region.start = max_t(u64, entry->start, minimum);
616615
region_end = min(entry->start + entry->size, mem_limit);
617616

618617
/* Give up if slot area array is full. */
@@ -673,7 +672,7 @@ static bool process_mem_region(struct mem_vector *region,
673672
* immovable memory and @region.
674673
*/
675674
for (i = 0; i < num_immovable_mem; i++) {
676-
unsigned long long start, end, entry_end, region_end;
675+
u64 start, end, entry_end, region_end;
677676
struct mem_vector entry;
678677

679678
if (!mem_overlaps(region, &immovable_mem[i]))

arch/x86/boot/compressed/misc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ int cmdline_find_option(const char *option, char *buffer, int bufsize);
7070
int cmdline_find_option_bool(const char *option);
7171

7272
struct mem_vector {
73-
unsigned long long start;
74-
unsigned long long size;
73+
u64 start;
74+
u64 size;
7575
};
7676

7777
#if CONFIG_RANDOMIZE_BASE

0 commit comments

Comments
 (0)