Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751866AbeAENIy (ORCPT + 1 other); Fri, 5 Jan 2018 08:08:54 -0500 Received: from terminus.zytor.com ([65.50.211.136]:33759 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751689AbeAENIu (ORCPT ); Fri, 5 Jan 2018 08:08:50 -0500 Date: Fri, 5 Jan 2018 05:04:07 -0800 From: tip-bot for David Woodhouse Message-ID: Cc: dave.hansen@intel.com, mingo@kernel.org, hpa@zytor.com, tim.c.chen@linux.intel.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, luto@amacapital.net, gregkh@linux-foundation.org, pjt@google.com, dwmw@amazon.co.uk, jikos@kernel.org, peterz@infradead.org, tglx@linutronix.de, keescook@google.com, riel@redhat.com Reply-To: riel@redhat.com, keescook@google.com, tglx@linutronix.de, peterz@infradead.org, jikos@kernel.org, dwmw@amazon.co.uk, pjt@google.com, luto@amacapital.net, gregkh@linux-foundation.org, torvalds@linux-foundation.org, hpa@zytor.com, mingo@kernel.org, tim.c.chen@linux.intel.com, linux-kernel@vger.kernel.org, dave.hansen@intel.com In-Reply-To: <20180104143710.8961-8-dwmw@amazon.co.uk> References: <20180104143710.8961-8-dwmw@amazon.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/alternatives: Add missing '\n' at end of ALTERNATIVE inline asm Git-Commit-ID: b9e705ef7cfaf22db0daab91ad3cd33b0fa32eb9 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Commit-ID: b9e705ef7cfaf22db0daab91ad3cd33b0fa32eb9 Gitweb: https://git.kernel.org/tip/b9e705ef7cfaf22db0daab91ad3cd33b0fa32eb9 Author: David Woodhouse AuthorDate: Thu, 4 Jan 2018 14:37:05 +0000 Committer: Thomas Gleixner CommitDate: Fri, 5 Jan 2018 14:01:15 +0100 x86/alternatives: Add missing '\n' at end of ALTERNATIVE inline asm Where an ALTERNATIVE is used in the middle of an inline asm block, this would otherwise lead to the following instruction being appended directly to the trailing ".popsection", and a failed compile. Fixes: 9cebed423c84 ("x86, alternative: Use .pushsection/.popsection") Signed-off-by: David Woodhouse Signed-off-by: Thomas Gleixner Cc: gnomes@lxorguk.ukuu.org.uk Cc: Rik van Riel Cc: ak@linux.intel.com Cc: Tim Chen Cc: Peter Zijlstra Cc: Paul Turner Cc: Jiri Kosina Cc: Andy Lutomirski Cc: Dave Hansen Cc: Kees Cook Cc: Linus Torvalds Cc: Greg Kroah-Hartman Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20180104143710.8961-8-dwmw@amazon.co.uk --- arch/x86/include/asm/alternative.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index dbfd085..cf5961c 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h @@ -140,7 +140,7 @@ static inline int alternatives_text_reserved(void *start, void *end) ".popsection\n" \ ".pushsection .altinstr_replacement, \"ax\"\n" \ ALTINSTR_REPLACEMENT(newinstr, feature, 1) \ - ".popsection" + ".popsection\n" #define ALTERNATIVE_2(oldinstr, newinstr1, feature1, newinstr2, feature2)\ OLDINSTR_2(oldinstr, 1, 2) \ @@ -151,7 +151,7 @@ static inline int alternatives_text_reserved(void *start, void *end) ".pushsection .altinstr_replacement, \"ax\"\n" \ ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \ ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \ - ".popsection" + ".popsection\n" /* * Alternative instructions for different CPU types or capabilities.