Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 292257f3 authored by Vincenzo Frascino's avatar Vincenzo Frascino Committed by Alistair Delva
Browse files

BACKPORT: x86/vdso: Enable x86 to use common headers 



Enable x86 to use only the common headers in the implementation
of the vDSO library.

Signed-off-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20200320145351.32292-24-vincenzo.frascino@arm.com


(cherry picked from commit abc22418db02b986fc5623c035507b6357e191ed)
Signed-off-by: default avatarMark Salyzyn <salyzyn@google.com>
Bug: 154668398
Change-Id: I05311771de9a6cf52a5b98812ac9ae0d933ac84a
parent ca84a233

arch/x86/include/asm/processor.h

+1 −11
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ struct vm86; 
#include <asm/special_insns.h>

#include <asm/fpu/types.h>

#include <asm/unwind_hints.h>

#include <asm/vdso/processor.h>



#include <linux/personality.h>

#include <linux/cache.h>
@@ -659,17 +660,6 @@ static inline unsigned int cpuid_edx(unsigned int op) 
	return edx;

}



/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */

static __always_inline void rep_nop(void)

{

	asm volatile("rep; nop" ::: "memory");

}



static __always_inline void cpu_relax(void)

{

	rep_nop();

}



/*

 * This function forces the icache and prefetched instruction stream to

 * catch up with reality in two very specific cases:

arch/x86/include/asm/vdso/processor.h

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2020 ARM Ltd.

 */

#ifndef __ASM_VDSO_PROCESSOR_H

#define __ASM_VDSO_PROCESSOR_H



#ifndef __ASSEMBLY__



/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */

static __always_inline void rep_nop(void)

{

	asm volatile("rep; nop" ::: "memory");

}



static __always_inline void cpu_relax(void)

{

	rep_nop();

}



#endif /* __ASSEMBLY__ */



#endif /* __ASM_VDSO_PROCESSOR_H */