diff options
| author | Borislav Petkov <bp@suse.de> | 2022-02-13 22:03:04 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2022-02-13 22:03:04 +0100 |
| commit | c0f6799de2a08f3860e8c13f85a7b9db51563ee0 (patch) | |
| tree | 4ef1dde004954a7cc28a508df005c4dfe4d4cb99 /arch | |
| parent | 754e0b0e35608ed5206d6a67a791563c631cec07 (diff) | |
| parent | b008893b08dcc8c30d756db05c229a1491bcb992 (diff) | |
Merge tip:locking/core into tip:ras/core
Pick up helpers inlining work in order to address more noinstr fallout
in the MCE code.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/cpumask.h | 10 | ||||
| -rw-r--r-- | arch/x86/include/asm/ptrace.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/arch/x86/include/asm/cpumask.h b/arch/x86/include/asm/cpumask.h index 3afa990d756b..c5aed9e9226c 100644 --- a/arch/x86/include/asm/cpumask.h +++ b/arch/x86/include/asm/cpumask.h @@ -20,11 +20,21 @@ static __always_inline bool arch_cpu_online(int cpu) { return arch_test_bit(cpu, cpumask_bits(cpu_online_mask)); } + +static __always_inline void arch_cpumask_clear_cpu(int cpu, struct cpumask *dstp) +{ + arch_clear_bit(cpumask_check(cpu), cpumask_bits(dstp)); +} #else static __always_inline bool arch_cpu_online(int cpu) { return cpu == 0; } + +static __always_inline void arch_cpumask_clear_cpu(int cpu, struct cpumask *dstp) +{ + return; +} #endif #define arch_cpu_is_offline(cpu) unlikely(!arch_cpu_online(cpu)) diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h index 703663175a5a..4357e0f2cd5f 100644 --- a/arch/x86/include/asm/ptrace.h +++ b/arch/x86/include/asm/ptrace.h @@ -137,7 +137,7 @@ static __always_inline int user_mode(struct pt_regs *regs) #endif } -static inline int v8086_mode(struct pt_regs *regs) +static __always_inline int v8086_mode(struct pt_regs *regs) { #ifdef CONFIG_X86_32 return (regs->flags & X86_VM_MASK); |