diff options
| author | Borislav Petkov <bp@suse.de> | 2020-06-04 12:50:44 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-06-15 19:29:36 +0200 |
| commit | 28b60197b573cd0b2d8f0ded56a5441c6147af14 (patch) | |
| tree | e3cfc5db75cbd9e3c342a8bba0e9108d2594eae8 /arch/x86/include | |
| parent | fbd5969d1ff2598143d6a6fbc9491a9e40ab9b82 (diff) | |
| download | linux-stable-28b60197b573cd0b2d8f0ded56a5441c6147af14.tar.gz linux-stable-28b60197b573cd0b2d8f0ded56a5441c6147af14.tar.bz2 linux-stable-28b60197b573cd0b2d8f0ded56a5441c6147af14.zip | |
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
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/asm.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h index 0f63585edf5f..5c15f95b1ba7 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 */ |