diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-01-28 17:29:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-01-28 22:55:23 +0100 |
| commit | 08b46d5dd869ea631d7c1c15535c930c8ea462e0 (patch) | |
| tree | 84e84315d27f6232b0ce864144eb75d72ab69c83 /arch/x86/kernel/e820.c | |
| parent | 09821ff1d50a1ecade182c2a68a90f835e257eef (diff) | |
| download | linux-08b46d5dd869ea631d7c1c15535c930c8ea462e0.tar.bz2 | |
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>
Diffstat (limited to 'arch/x86/kernel/e820.c')
| -rw-r--r-- | arch/x86/kernel/e820.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 90dcd240a389..055ac2484729 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -261,10 +261,10 @@ static int __init cpcompare(const void *a, const void *b) int __init e820__update_table(struct e820_entry *biosmap, int max_nr_map, u32 *pnr_map) { - static struct change_member change_point_list[2*E820_X_MAX] __initdata; - static struct change_member *change_point[2*E820_X_MAX] __initdata; - static struct e820_entry *overlap_list[E820_X_MAX] __initdata; - static struct e820_entry new_bios[E820_X_MAX] __initdata; + static struct change_member change_point_list[2*E820_MAX_ENTRIES] __initdata; + static struct change_member *change_point[2*E820_MAX_ENTRIES] __initdata; + static struct e820_entry *overlap_list[E820_MAX_ENTRIES] __initdata; + static struct e820_entry new_bios[E820_MAX_ENTRIES] __initdata; enum e820_type current_type, last_type; unsigned long long last_addr; int chgidx; |