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

Commit 8e3c2a8c authored by Borislav Petkov's avatar Borislav Petkov Committed by H. Peter Anvin
Browse files

x86: Drop KERNEL_IMAGE_START 



We have KERNEL_IMAGE_START and __START_KERNEL_map which both contain the
start of the kernel text mapping's virtual address. Remove the prior one
which has been replicated a lot less times around the tree.

No functionality change.

Signed-off-by: default avatarBorislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/1362428180-8865-3-git-send-email-bp@alien8.de


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 2dead15f

arch/x86/include/asm/page_64_types.h

+0 −1
Original line number Diff line number Diff line
@@ -48,6 +48,5 @@ 
 * arch/x86/kernel/head_64.S), and it is mapped here:

 */

#define KERNEL_IMAGE_SIZE	(512 * 1024 * 1024)

#define KERNEL_IMAGE_START	_AC(0xffffffff80000000, UL)



#endif /* _ASM_X86_PAGE_64_DEFS_H */

arch/x86/kernel/head64.c

+3 −3
Original line number Diff line number Diff line
@@ -144,10 +144,10 @@ void __init x86_64_start_kernel(char * real_mode_data) 
	 * Build-time sanity checks on the kernel image and module

	 * area mappings. (these are purely build-time and produce no code)

	 */

	BUILD_BUG_ON(MODULES_VADDR < KERNEL_IMAGE_START);

	BUILD_BUG_ON(MODULES_VADDR-KERNEL_IMAGE_START < KERNEL_IMAGE_SIZE);

	BUILD_BUG_ON(MODULES_VADDR < __START_KERNEL_map);

	BUILD_BUG_ON(MODULES_VADDR - __START_KERNEL_map < KERNEL_IMAGE_SIZE);

	BUILD_BUG_ON(MODULES_LEN + KERNEL_IMAGE_SIZE > 2*PUD_SIZE);

	BUILD_BUG_ON((KERNEL_IMAGE_START & ~PMD_MASK) != 0);

	BUILD_BUG_ON((__START_KERNEL_map & ~PMD_MASK) != 0);

	BUILD_BUG_ON((MODULES_VADDR & ~PMD_MASK) != 0);

	BUILD_BUG_ON(!(MODULES_VADDR > __START_KERNEL));

	BUILD_BUG_ON(!(((MODULES_END - 1) & PGDIR_MASK) ==