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

Merge tag 'x86_cleanups_for_v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cleanups from Borislav Petkov:
 "Misc minor cleanups"

* tag 'x86_cleanups_for_v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/entry: Fix typo in comments for syscall_enter_from_user_mode()
  x86/resctrl: Fix spelling in user-visible warning messages
  x86/entry/64: Do not include inst.h in calling.h
  x86/mpparse: Remove duplicate io_apic.h include
parents a0d445f7 900ffe39

arch/x86/entry/calling.h

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include <asm/percpu.h>

#include <asm/asm-offsets.h>

#include <asm/processor-flags.h>

#include <asm/inst.h>



/*

arch/x86/kernel/cpu/resctrl/core.c

+2 −2
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ static void domain_add_cpu(int cpu, struct rdt_resource *r) 


	d = rdt_find_domain(r, id, &add_pos);

	if (IS_ERR(d)) {

		pr_warn("Could't find cache id for cpu %d\n", cpu);

		pr_warn("Couldn't find cache id for CPU %d\n", cpu);

		return;

	}
@@ -607,7 +607,7 @@ static void domain_remove_cpu(int cpu, struct rdt_resource *r) 


	d = rdt_find_domain(r, id, NULL);

	if (IS_ERR_OR_NULL(d)) {

		pr_warn("Could't find cache id for cpu %d\n", cpu);

		pr_warn("Couldn't find cache id for CPU %d\n", cpu);

		return;

	}

arch/x86/kernel/mpparse.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <asm/irqdomain.h>

#include <asm/mtrr.h>

#include <asm/mpspec.h>

#include <asm/io_apic.h>

#include <asm/proto.h>

#include <asm/bios_ebda.h>

#include <asm/e820/api.h>

include/linux/entry-common.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#endif



/*

 * TIF flags handled in syscall_enter_from_usermode()

 * TIF flags handled in syscall_enter_from_user_mode()

 */

#ifndef ARCH_SYSCALL_ENTER_WORK

# define ARCH_SYSCALL_ENTER_WORK	(0)

kernel/entry/common.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static inline bool report_single_step(unsigned long ti_work) 
/*

 * If TIF_SYSCALL_EMU is set, then the only reason to report is when

 * TIF_SINGLESTEP is set (i.e. PTRACE_SYSEMU_SINGLESTEP).  This syscall

 * instruction has been already reported in syscall_enter_from_usermode().

 * instruction has been already reported in syscall_enter_from_user_mode().

 */

#define SYSEMU_STEP	(_TIF_SINGLESTEP | _TIF_SYSCALL_EMU)

CRA Git | Maintained and supported by SUSTech CRA and CCSE