lkml.org 
[lkml]   [2020]   [Jun]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip: x86/cleanups] x86/asm: Unify __ASSEMBLY__ blocks
The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID: 28b60197b573cd0b2d8f0ded56a5441c6147af14
Gitweb: https://git.kernel.org/tip/28b60197b573cd0b2d8f0ded56a5441c6147af14
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Thu, 04 Jun 2020 12:50:44 +02:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Mon, 15 Jun 2020 19:29:36 +02:00

x86/asm: Unify __ASSEMBLY__ blocks

Merge the two ifndef __ASSEMBLY__ blocks.

No functional changes.

Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200604133204.7636-1-bp@alien8.de
---
arch/x86/include/asm/asm.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h
index 0f63585..5c15f95 100644
--- a/arch/x86/include/asm/asm.h
+++ b/arch/x86/include/asm/asm.h
@@ -144,7 +144,7 @@
_ASM_PTR (entry); \
.popsection

-#else
+#else /* ! __ASSEMBLY__ */
# define _EXPAND_EXTABLE_HANDLE(x) #x
# define _ASM_EXTABLE_HANDLE(from, to, handler) \
" .pushsection \"__ex_table\",\"a\"\n" \
@@ -164,9 +164,7 @@
_ASM_EXTABLE_HANDLE(from, to, ex_handler_fault)

/* For C file, we already have NOKPROBE_SYMBOL macro */
-#endif

-#ifndef __ASSEMBLY__
/*
* This output constraint should be used for any inline asm which has a "call"
* instruction. Otherwise the asm may be inserted before the frame pointer
@@ -175,6 +173,6 @@
*/
register unsigned long current_stack_pointer asm(_ASM_SP);
#define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer)
-#endif
+#endif /* __ASSEMBLY__ */

#endif /* _ASM_X86_ASM_H */
\
 
 \ /
  Last update: 2020-06-15 21:28    [W:0.045 / U:0.156 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site