diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-31 11:47:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-31 11:47:24 -0800 |
| commit | e7c632fc479a8ac28da19252d44b0bd90a2638f6 (patch) | |
| tree | a3c53ae200192b6931e00a52127afdd49c84a6a5 /arch/x86/include | |
| parent | 88fa025d30ea97a2aae6394794bdfc31dc9423b7 (diff) | |
| parent | 7ad1437d6ace0e450a6c1167720608ad660b191d (diff) | |
| download | linux-stable-e7c632fc479a8ac28da19252d44b0bd90a2638f6.tar.gz linux-stable-e7c632fc479a8ac28da19252d44b0bd90a2638f6.tar.bz2 linux-stable-e7c632fc479a8ac28da19252d44b0bd90a2638f6.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Thomas Gleixner:
- plug a memory leak in the intel pmu init code
- clang fixes
- tooling fix to avoid including kernel headers
- a fix for jvmti to generate correct debug information for inlined
code
- replace backtick with a regular shell function
- fix the build in hardened environments
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/intel: Plug memory leak in intel_pmu_init()
x86/asm: Allow again using asm.h when building for the 'bpf' clang target
tools arch s390: Do not include header files from the kernel sources
perf jvmti: Generate correct debug information for inlined code
perf tools: Fix up build in hardened environments
perf tools: Use shell function for perl cflags retrieval
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/asm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h index 219faaec51df..386a6900e206 100644 --- a/arch/x86/include/asm/asm.h +++ b/arch/x86/include/asm/asm.h @@ -136,6 +136,7 @@ #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 @@ -145,5 +146,6 @@ register unsigned long current_stack_pointer asm(_ASM_SP); #define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer) #endif +#endif #endif /* _ASM_X86_ASM_H */ |