The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: fae7bfcc78146057ac2730719de8d5e41de19540 Gitweb: https://git.kernel.org/tip/fae7bfcc78146057ac2730719de8d5e41de19540 Author: Anthony Steinhauser <asteinhauser@xxxxxxxxxx> AuthorDate: Thu, 26 Dec 2019 12:45:12 -08:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Thu, 02 Jan 2020 10:54:53 +01:00 x86/nospec: Remove unused RSB_FILL_LOOPS It was never really used, see 117cc7a908c8 ("x86/retpoline: Fill return stack buffer on vmexit") [ bp: Massage. ] Signed-off-by: Anthony Steinhauser <asteinhauser@xxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: x86-ml <x86@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20191226204512.24524-1-asteinhauser@xxxxxxxxxx --- arch/x86/include/asm/nospec-branch.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index 5c24a7b..07e95dc 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -37,7 +37,6 @@ */ #define RSB_CLEAR_LOOPS 32 /* To forcibly overwrite all entries */ -#define RSB_FILL_LOOPS 16 /* To avoid underflow */ /* * Google experimented with loop-unrolling and this turned out to be