Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752938AbcD2KuA (ORCPT ); Fri, 29 Apr 2016 06:50:00 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54580 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752867AbcD2Kt6 (ORCPT ); Fri, 29 Apr 2016 06:49:58 -0400 Date: Fri, 29 Apr 2016 03:49:03 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: peterz@infradead.org, brgerst@gmail.com, linux-kernel@vger.kernel.org, bp@alien8.de, mingo@kernel.org, luto@kernel.org, torvalds@linux-foundation.org, dvlasenk@redhat.com, tglx@linutronix.de, hpa@zytor.com, luto@amacapital.net Reply-To: mingo@kernel.org, luto@kernel.org, torvalds@linux-foundation.org, dvlasenk@redhat.com, hpa@zytor.com, tglx@linutronix.de, luto@amacapital.net, brgerst@gmail.com, peterz@infradead.org, linux-kernel@vger.kernel.org, bp@alien8.de In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm: Make asm/alternative.h safe from assembly Git-Commit-ID: f005f5d860e0231fe212cfda8c1a3148b99609f4 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 Content-Length: 1658 Lines: 47 Commit-ID: f005f5d860e0231fe212cfda8c1a3148b99609f4 Gitweb: http://git.kernel.org/tip/f005f5d860e0231fe212cfda8c1a3148b99609f4 Author: Andy Lutomirski AuthorDate: Tue, 26 Apr 2016 12:23:25 -0700 Committer: Ingo Molnar CommitDate: Fri, 29 Apr 2016 11:56:41 +0200 x86/asm: Make asm/alternative.h safe from assembly asm/alternative.h isn't directly useful from assembly, but it shouldn't break the build. Signed-off-by: Andy Lutomirski Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/e5b693fcef99fe6e80341c9e97a002fb23871e91.1461698311.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/include/asm/alternative.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index be4496c..e77a644 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h @@ -1,6 +1,8 @@ #ifndef _ASM_X86_ALTERNATIVE_H #define _ASM_X86_ALTERNATIVE_H +#ifndef __ASSEMBLY__ + #include #include #include @@ -232,4 +234,6 @@ static inline int alternatives_text_reserved(void *start, void *end) */ #define ASM_NO_INPUT_CLOBBER(clbr...) "i" (0) : clbr +#endif /* __ASSEMBLY__ */ + #endif /* _ASM_X86_ALTERNATIVE_H */