Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8a22a62 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by H. Peter Anvin
Browse files

x86-32: remove ALLOCATOR_SLOP from head_32.S 



Impact: cleanup

ALLOCATOR_SLOP is a vestigial remain from when we used the
bootmem allocator to allocate the kernel's linear memory mapping.
Now we directly reserve pages from the e820 mapping, and no
longer require secondary structures to keep track of allocated
pages.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent c090f532

arch/x86/kernel/head_32.S

+1 −2
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 
#else

#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)

#endif

ALLOCATOR_SLOP = 4



/* Enough space to fit pagetables for the low memory linear map */

MAPPING_BEYOND_END = (PAGE_TABLE_SIZE(1 << (32 - PAGE_SHIFT)) * PAGE_SIZE)
@@ -70,7 +69,7 @@ MAPPING_BEYOND_END = (PAGE_TABLE_SIZE(1 << (32 - PAGE_SHIFT)) * PAGE_SIZE) 
 */

KERNEL_PAGES = (KERNEL_IMAGE_SIZE + MAPPING_BEYOND_END)>>PAGE_SHIFT



INIT_MAP_SIZE = (PAGE_TABLE_SIZE(KERNEL_PAGES) + ALLOCATOR_SLOP) * PAGE_SIZE_asm

INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE_asm

RESERVE_BRK(pagetables, INIT_MAP_SIZE)



/*