From: Arnaldo Carvalho de Melo <a...@redhat.com> This reverts commit ca26cffa4e4aaeb09bb9e308f95c7835cb149248.
Newer clang versions accept that asm(_ASM_SP) construct, and now that the bpf-script-test-kbuild.c script, used in one of the 'perf test LLVM' subtests doesn't include ptrace.h, which ended up including arch/x86/include/asm/asm.h, we can revert this patch. Suggested-by: Yonghong Song <y...@fb.com> Link: https://lkml.kernel.org/r/613f0a0d-c433-8f4d-dcc1-c9889deae...@fb.com Acked-by: Yonghong Song <y...@fb.com> Cc: Adrian Hunter <adrian.hun...@intel.com> Cc: Alexander Potapenko <gli...@google.com> Cc: Alexei Starovoitov <alexei.starovoi...@gmail.com> Cc: Andrey Ryabinin <aryabi...@virtuozzo.com> Cc: Andy Lutomirski <l...@kernel.org> Cc: Arnd Bergmann <a...@arndb.de> Cc: Daniel Borkmann <dan...@iogearbox.net> Cc: David Ahern <dsah...@gmail.com> Cc: Dmitriy Vyukov <dvyu...@google.com> Cc: Jiri Olsa <jo...@kernel.org> Cc: Josh Poimboeuf <jpoim...@redhat.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Matthias Kaehlcke <m...@chromium.org> Cc: Miguel Bernal Marin <miguel.bernal.ma...@linux.intel.com> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Wang Nan <wangn...@huawei.com> Link: https://lkml.kernel.org/n/tip-nqozcv8loq40tkqpfw997...@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- arch/x86/include/asm/asm.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h index 386a6900e206..219faaec51df 100644 --- a/arch/x86/include/asm/asm.h +++ b/arch/x86/include/asm/asm.h @@ -136,7 +136,6 @@ #endif #ifndef __ASSEMBLY__ -#ifndef __BPF__ /* * 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 @@ -146,6 +145,5 @@ register unsigned long current_stack_pointer asm(_ASM_SP); #define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer) #endif -#endif #endif /* _ASM_X86_ASM_H */ -- 2.14.3
