Commit f1e0527d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 fixes from Ingo Molnar:
 "Misc fixes:

   - two boot crash fixes
   - unwinder fixes
   - kexec related kernel direct mappings enhancements/fixes
   - more Clang support quirks
   - minor cleanups
   - Documentation fixes"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/intel_rdt: Fix a typo in Documentation
  x86/build: Don't add -maccumulate-outgoing-args w/o compiler support
  x86/boot/32: Fix UP boot on Quark and possibly other platforms
  x86/mm/32: Set the '__vmalloc_start_set' flag in initmem_init()
  x86/kexec/64: Use gbpages for identity mappings if available
  x86/mm: Add support for gbpages to kernel_ident_mapping_init()
  x86/boot: Declare error() as noreturn
  x86/mm/kaslr: Use the _ASM_MUL macro for multiplication to work around Clang incompatibility
  x86/mm: Fix boot crash caused by incorrect loop count calculation in sync_global_pgds()
  x86/asm: Don't use RBP as a temporary register in csum_partial_copy_generic()
  x86/microcode/AMD: Remove redundant NULL check on mc
parents 5836e422 fb8fb46c

Documentation/x86/intel_rdt_ui.txt

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ kernel and the tasks running there get 50% of the cache. They should 
also get 50% of memory bandwidth assuming that the cores 4-7 are SMT

siblings and only the real time threads are scheduled on the cores 4-7.



# echo C0 > p0/cpus

# echo F0 > p0/cpus



4) Locking between applications

arch/x86/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -179,7 +179,8 @@ ifdef CONFIG_JUMP_LABEL 
endif



ifeq ($(ACCUMULATE_OUTGOING_ARGS), 1)

	KBUILD_CFLAGS += -maccumulate-outgoing-args

	# This compiler flag is not supported by Clang:

	KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args,)

endif



# Stackpointer is addressed different for 32 bit and 64 bit x86

arch/x86/boot/compressed/error.h

+3 −1
Original line number Diff line number Diff line 
#ifndef BOOT_COMPRESSED_ERROR_H

#define BOOT_COMPRESSED_ERROR_H



#include <linux/compiler.h>



void warn(char *m);

void error(char *m);

void error(char *m) __noreturn;



#endif /* BOOT_COMPRESSED_ERROR_H */

arch/x86/boot/compressed/pagetable.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static unsigned long level4p; 
 * Due to relocation, pointers must be assigned at run time not build time.

 */

static struct x86_mapping_info mapping_info = {

	.pmd_flag       = __PAGE_KERNEL_LARGE_EXEC,

	.page_flag       = __PAGE_KERNEL_LARGE_EXEC,

};



/* Locates and clears a region for a new top level page table. */

arch/x86/include/asm/asm.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#define _ASM_ADD	__ASM_SIZE(add)

#define _ASM_SUB	__ASM_SIZE(sub)

#define _ASM_XADD	__ASM_SIZE(xadd)

#define _ASM_MUL	__ASM_SIZE(mul)



#define _ASM_AX		__ASM_REG(ax)

#define _ASM_BX		__ASM_REG(bx)

CRA Git | Maintained and supported by SUSTech CRA and CCSE