Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964859AbeAJC2o (ORCPT + 1 other); Tue, 9 Jan 2018 21:28:44 -0500 Received: from mga09.intel.com ([134.134.136.24]:51746 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964810AbeAJC2l (ORCPT ); Tue, 9 Jan 2018 21:28:41 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,337,1511856000"; d="scan'208";a="18849482" From: Andi Kleen To: tglx@linutronix.de Cc: x86@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, dwmw@amazon.co.uk, pjt@google.com, luto@kernel.org, peterz@infradead.org, thomas.lendacky@amd.com, tim.c.chen@linux.intel.com, gregkh@linux-foundation.org, dave.hansen@intel.com, jikos@kernel.org, Andi Kleen Subject: [PATCH v3 3/3] x86/retpoline: Convert generic specific retpolines to use RETPOLINE_GENERIC Date: Tue, 9 Jan 2018 18:28:31 -0800 Message-Id: <20180110022831.29826-4-andi@firstfloor.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180110022831.29826-1-andi@firstfloor.org> References: <20180110022831.29826-1-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: From: Andi Kleen X86_FEATURE_RETPOLINE has been renamed to X86_FEATURE_RETPOLINE_GENERIC. Convert the sequences using it. Signed-off-by: Andi Kleen --- arch/x86/entry/entry_32.S | 2 +- arch/x86/entry/entry_64.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index d2ef7f32905b..b3e4a2e35877 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -258,7 +258,7 @@ ENTRY(__switch_to_asm) * any calls on the new stack, and this can be difficult to * ensure in a complex C function like __switch_to. */ - ALTERNATIVE "", "FILL_RETURN_BUFFER %ebx", X86_FEATURE_RETPOLINE + ALTERNATIVE "", "FILL_RETURN_BUFFER %ebx", X86_FEATURE_RETPOLINE_GENERIC #endif /* restore callee-saved registers */ diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 58dbf7a12a05..566734018d76 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -501,7 +501,7 @@ ENTRY(__switch_to_asm) * any calls on the new stack, and this can be difficult to * ensure in a complex C function like __switch_to. */ - ALTERNATIVE "", "FILL_RETURN_BUFFER %r12", X86_FEATURE_RETPOLINE + ALTERNATIVE "", "FILL_RETURN_BUFFER %r12", X86_FEATURE_RETPOLINE_GENERIC #endif /* restore callee-saved registers */ -- 2.14.3