Commit 82672cc0 authored by Nadav Amit's avatar Nadav Amit Committed by Zheng Zengkai
Browse files

x86/mm/tlb: Remove unnecessary uses of the inline keyword 

mainline inclusion
from mainline-v5.13-rc1
commit 1608e4cf
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I3ZV2C


CVE: NA

-------------------------------------------------

The compiler is smart enough without these hints.

Suggested-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: default avatarNadav Amit <namit@vmware.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/r/20210220231712.2475218-9-namit@vmware.com


Signed-off-by: default avatarTong Tiangen <tongtiangen@huawei.com>
Reviewed-by: default avatarChen Wandun <chenwandun@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent cbb279a5

arch/x86/mm/tlb.c

+3 −3
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ void switch_mm(struct mm_struct *prev, struct mm_struct *next, 
	local_irq_restore(flags);

}



static inline unsigned long mm_mangle_tif_spec_ib(struct task_struct *next)

static unsigned long mm_mangle_tif_spec_ib(struct task_struct *next)

{

	unsigned long next_tif = task_thread_info(next)->flags;

	unsigned long ibpb = (next_tif >> TIF_SPEC_IB) & LAST_USER_MM_IBPB;
@@ -880,7 +880,7 @@ static DEFINE_PER_CPU_SHARED_ALIGNED(struct flush_tlb_info, flush_tlb_info); 
static DEFINE_PER_CPU(unsigned int, flush_tlb_info_idx);

#endif



static inline struct flush_tlb_info *get_flush_tlb_info(struct mm_struct *mm,

static struct flush_tlb_info *get_flush_tlb_info(struct mm_struct *mm,

			unsigned long start, unsigned long end,

			unsigned int stride_shift, bool freed_tables,

			u64 new_tlb_gen)
@@ -907,7 +907,7 @@ static inline struct flush_tlb_info *get_flush_tlb_info(struct mm_struct *mm, 
	return info;

}



static inline void put_flush_tlb_info(void)

static void put_flush_tlb_info(void)

{

#ifdef CONFIG_DEBUG_VM

	/* Complete reentrency prevention checks */