Commit 601a8807 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:
 "A number of fixes and some late updates:

   - make in_compat_syscall() behavior on x86-32 similar to other
     platforms, this touches a number of generic files but is not
     intended to impact non-x86 platforms.

   - objtool fixes

   - PAT preemption fix

   - paravirt fixes/cleanups

   - cpufeatures updates for new instructions

   - earlyprintk quirk

   - make microcode version in sysfs world-readable (it is already
     world-readable in procfs)

   - minor cleanups and fixes"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  compat: Cleanup in_compat_syscall() callers
  x86/compat: Adjust in_compat_syscall() to generic code under !COMPAT
  objtool: Support GCC 9 cold subfunction naming scheme
  x86/numa_emulation: Fix uniform-split numa emulation
  x86/paravirt: Remove unused _paravirt_ident_32
  x86/mm/pat: Disable preemption around __flush_tlb_all()
  x86/paravirt: Remove GPL from pv_ops export
  x86/traps: Use format string with panic() call
  x86: Clean up 'sizeof x' => 'sizeof(x)'
  x86/cpufeatures: Enumerate MOVDIR64B instruction
  x86/cpufeatures: Enumerate MOVDIRI instruction
  x86/earlyprintk: Add a force option for pciserial device
  objtool: Support per-function rodata sections
  x86/microcode: Make revision and processor flags world-readable
parents 01897f3e 23a12dde

Documentation/admin-guide/kernel-parameters.txt

+5 −1
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ 
			earlyprintk=serial[,0x...[,baudrate]]

			earlyprintk=ttySn[,baudrate]

			earlyprintk=dbgp[debugController#]

			earlyprintk=pciserial,bus:device.function[,baudrate]

			earlyprintk=pciserial[,force],bus:device.function[,baudrate]

			earlyprintk=xdbc[xhciController#]



			earlyprintk is useful when the kernel crashes before
@@ -1100,6 +1100,10 @@ 


			The sclp output can only be used on s390.



			The optional "force" to "pciserial" enables use of a

			PCI device even when its classcode is not of the

			UART class.



	edac_report=	[HW,EDAC] Control how to report EDAC event

			Format: {"on" | "off" | "force"}

			on: enable EDAC to report H/W event. May be overridden

arch/x86/boot/cpucheck.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr) 
{

	int err;



	memset(&cpu.flags, 0, sizeof cpu.flags);

	memset(&cpu.flags, 0, sizeof(cpu.flags));

	cpu.level = 3;



	if (has_eflag(X86_EFLAGS_AC))

arch/x86/boot/early_serial_console.c

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void parse_earlyprintk(void) 
	int pos = 0;

	int port = 0;



	if (cmdline_find_option("earlyprintk", arg, sizeof arg) > 0) {

	if (cmdline_find_option("earlyprintk", arg, sizeof(arg)) > 0) {

		char *e;



		if (!strncmp(arg, "serial", 6)) {
@@ -124,7 +124,7 @@ static void parse_console_uart8250(void) 
	 * console=uart8250,io,0x3f8,115200n8

	 * need to make sure it is last one console !

	 */

	if (cmdline_find_option("console", optstr, sizeof optstr) <= 0)

	if (cmdline_find_option("console", optstr, sizeof(optstr)) <= 0)

		return;



	options = optstr;

arch/x86/boot/edd.c

+3 −3
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static int get_edd_info(u8 devno, struct edd_info *ei) 
{

	struct biosregs ireg, oreg;



	memset(ei, 0, sizeof *ei);

	memset(ei, 0, sizeof(*ei));



	/* Check Extensions Present */
@@ -133,7 +133,7 @@ void query_edd(void) 
	struct edd_info ei, *edp;

	u32 *mbrptr;



	if (cmdline_find_option("edd", eddarg, sizeof eddarg) > 0) {

	if (cmdline_find_option("edd", eddarg, sizeof(eddarg)) > 0) {

		if (!strcmp(eddarg, "skipmbr") || !strcmp(eddarg, "skip")) {

			do_edd = 1;

			do_mbr = 0;
@@ -166,7 +166,7 @@ void query_edd(void) 
		 */

		if (!get_edd_info(devno, &ei)

		    && boot_params.eddbuf_entries < EDDMAXNR) {

			memcpy(edp, &ei, sizeof ei);

			memcpy(edp, &ei, sizeof(ei));

			edp++;

			boot_params.eddbuf_entries++;

		}

arch/x86/boot/main.c

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ static void copy_boot_params(void) 
	const struct old_cmdline * const oldcmd =

		(const struct old_cmdline *)OLD_CL_ADDRESS;



	BUILD_BUG_ON(sizeof boot_params != 4096);

	memcpy(&boot_params.hdr, &hdr, sizeof hdr);

	BUILD_BUG_ON(sizeof(boot_params) != 4096);

	memcpy(&boot_params.hdr, &hdr, sizeof(hdr));



	if (!boot_params.hdr.cmd_line_ptr &&

	    oldcmd->cl_magic == OLD_CL_MAGIC) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE