Commit 28b60197 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

x86/asm: Unify __ASSEMBLY__ blocks 



Merge the two ifndef __ASSEMBLY__ blocks.

No functional changes.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200604133204.7636-1-bp@alien8.de
parent fbd5969d

arch/x86/include/asm/asm.h

+2 −4
Original line number Diff line number Diff line
@@ -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 */