x86/boot/e820: Clean up the E820 table size define names
We've got a number of defines related to the E820 table and its size: E820MAP E820NR E820_X_MAX E820MAX The first two denote byte offsets into the zeropage (struct boot_params), and can are not used in the kernel and can be removed. The E820_*_MAX values have an inconsistent structure and it's unclear in any case what they mean. 'X' presuably goes for extended - but it's not very expressive altogether. Change these over to: E820_MAX_ENTRIES_ZEROPAGE E820_MAX_ENTRIES ... which are self-explanatory names. 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>
This commit is contained in:
@@ -373,14 +373,14 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range,
|
||||
return nr_range;
|
||||
}
|
||||
|
||||
struct range pfn_mapped[E820_X_MAX];
|
||||
struct range pfn_mapped[E820_MAX_ENTRIES];
|
||||
int nr_pfn_mapped;
|
||||
|
||||
static void add_pfn_range_mapped(unsigned long start_pfn, unsigned long end_pfn)
|
||||
{
|
||||
nr_pfn_mapped = add_range_with_merge(pfn_mapped, E820_X_MAX,
|
||||
nr_pfn_mapped = add_range_with_merge(pfn_mapped, E820_MAX_ENTRIES,
|
||||
nr_pfn_mapped, start_pfn, end_pfn);
|
||||
nr_pfn_mapped = clean_sort_range(pfn_mapped, E820_X_MAX);
|
||||
nr_pfn_mapped = clean_sort_range(pfn_mapped, E820_MAX_ENTRIES);
|
||||
|
||||
max_pfn_mapped = max(max_pfn_mapped, end_pfn);
|
||||
|
||||
|
Reference in New Issue
Block a user