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

Commit 874f6d1b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cleanups from Ingo Molnar:
 "Misc smaller cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/lib: Fix spelling, put space between a numeral and its units
  x86/lib: Fix spelling in the comments
  x86, quirks: Shut-up a long-standing gcc warning
  x86, msr: Unify variable names
  x86-64, docs, mm: Add vsyscall range to virtual address space layout
  x86: Drop KERNEL_IMAGE_START
  x86_64: Use __BOOT_DS instead_of __KERNEL_DS for safety
parents e486b4c4 d50ba368

Documentation/x86/x86_64/mm.txt

+3 −1
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ ffffe90000000000 - ffffe9ffffffffff (=40 bits) hole 
ffffea0000000000 - ffffeaffffffffff (=40 bits) virtual memory map (1TB)

... unused hole ...

ffffffff80000000 - ffffffffa0000000 (=512 MB)  kernel text mapping, from phys 0

ffffffffa0000000 - fffffffffff00000 (=1536 MB) module mapping space

ffffffffa0000000 - ffffffffff5fffff (=1525 MB) module mapping space

ffffffffff600000 - ffffffffffdfffff (=8 MB) vsyscalls

ffffffffffe00000 - ffffffffffffffff (=2 MB) unused hole



The direct mapping covers all memory in the system up to the highest

memory address (this means in some cases it can also include PCI memory

arch/x86/boot/compressed/head_64.S

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ ENTRY(startup_32) 
	jnz 1f



	cli

	movl	$(__KERNEL_DS), %eax

	movl	$(__BOOT_DS), %eax

	movl	%eax, %ds

	movl	%eax, %es

	movl	%eax, %ss

arch/x86/include/asm/msr.h

+7 −7
Original line number Diff line number Diff line
@@ -137,11 +137,11 @@ static inline unsigned long long native_read_pmc(int counter) 
 * pointer indirection), this allows gcc to optimize better

 */



#define rdmsr(msr, val1, val2)					\

#define rdmsr(msr, low, high)					\

do {								\

	u64 __val = native_read_msr((msr));			\

	(void)((val1) = (u32)__val);				\

	(void)((val2) = (u32)(__val >> 32));			\

	(void)((low) = (u32)__val);				\

	(void)((high) = (u32)(__val >> 32));			\

} while (0)



static inline void wrmsr(unsigned msr, unsigned low, unsigned high)
@@ -162,12 +162,12 @@ static inline int wrmsr_safe(unsigned msr, unsigned low, unsigned high) 
}



/* rdmsr with exception handling */

#define rdmsr_safe(msr, p1, p2)					\

#define rdmsr_safe(msr, low, high)				\

({								\

	int __err;						\

	u64 __val = native_read_msr_safe((msr), &__err);	\

	(*p1) = (u32)__val;					\

	(*p2) = (u32)(__val >> 32);				\

	(*low) = (u32)__val;					\

	(*high) = (u32)(__val >> 32);				\

	__err;							\

})
@@ -208,7 +208,7 @@ do { \ 
#define wrmsrl_safe(msr, val) wrmsr_safe((msr), (u32)(val),		\

					     (u32)((val) >> 32))



#define write_tsc(val1, val2) wrmsr(MSR_IA32_TSC, (val1), (val2))

#define write_tsc(low, high) wrmsr(MSR_IA32_TSC, (low), (high))



#define write_rdtscp_aux(val) wrmsr(MSR_TSC_AUX, (val), 0)

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) ==