x86/boot/e820: Rename 'e820_map' variables to 'e820_array'
In line with the rename to 'struct e820_array', harmonize the naming of common e820 table variable names as well: e820 => e820_array e820_saved => e820_array_saved e820_map => e820_array initial_e820 => e820_array_init This makes the variable names more consistent and easier to grep for. No change in functionality. Cc: Alex Thorlton <athorlton@sgi.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Huang, Ying <ying.huang@intel.com> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Juergen Gross <jgross@suse.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paul Jackson <pj@sgi.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rafael J. Wysocki <rjw@sisk.pl> Cc: Tejun Heo <tj@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Wei Yang <richard.weiyang@gmail.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Этот коммит содержится в:
@@ -100,14 +100,14 @@ static int setup_e820_entries(struct boot_params *params)
|
||||
{
|
||||
unsigned int nr_e820_entries;
|
||||
|
||||
nr_e820_entries = e820_saved->nr_map;
|
||||
nr_e820_entries = e820_array_saved->nr_map;
|
||||
|
||||
/* TODO: Pass entries more than E820MAX in bootparams setup data */
|
||||
if (nr_e820_entries > E820MAX)
|
||||
nr_e820_entries = E820MAX;
|
||||
|
||||
params->e820_entries = nr_e820_entries;
|
||||
memcpy(¶ms->e820_map, &e820_saved->map,
|
||||
memcpy(¶ms->e820_array, &e820_array_saved->map,
|
||||
nr_e820_entries * sizeof(struct e820_entry));
|
||||
|
||||
return 0;
|
||||
@@ -233,10 +233,10 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params,
|
||||
nr_e820_entries = params->e820_entries;
|
||||
|
||||
for (i = 0; i < nr_e820_entries; i++) {
|
||||
if (params->e820_map[i].type != E820_RAM)
|
||||
if (params->e820_array[i].type != E820_RAM)
|
||||
continue;
|
||||
start = params->e820_map[i].addr;
|
||||
end = params->e820_map[i].addr + params->e820_map[i].size - 1;
|
||||
start = params->e820_array[i].addr;
|
||||
end = params->e820_array[i].addr + params->e820_array[i].size - 1;
|
||||
|
||||
if ((start <= 0x100000) && end > 0x100000) {
|
||||
mem_k = (end >> 10) - (0x100000 >> 10);
|
||||
|
Ссылка в новой задаче
Block a user