diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-11 07:54:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-11 07:54:29 -0700 |
| commit | 7c6baa304b841673d3a55ea4fcf9a5cbf7a1674b (patch) | |
| tree | a6f9970cebfb573a74a4abd06ff9caee41460e9a /arch | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | s390: Fix a header dependencies related build error (diff) | |
| download | linux-dev-7c6baa304b841673d3a55ea4fcf9a5cbf7a1674b.tar.xz linux-dev-7c6baa304b841673d3a55ea4fcf9a5cbf7a1674b.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Misc minor fixes mostly related to tracing"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
s390: Fix a header dependencies related build error
tracing: update documentation of snapshot utility
tracing: Do not return EINVAL in snapshot when not allocated
tracing: Add help of snapshot feature when snapshot is empty
ftrace: Update the kconfig for DYNAMIC_FTRACE
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/include/asm/cpu_mf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/include/asm/cpu_mf.h b/arch/s390/include/asm/cpu_mf.h index f1eddd150dd7..c879fad404c8 100644 --- a/arch/s390/include/asm/cpu_mf.h +++ b/arch/s390/include/asm/cpu_mf.h @@ -12,6 +12,7 @@ #ifndef _ASM_S390_CPU_MF_H #define _ASM_S390_CPU_MF_H +#include <linux/errno.h> #include <asm/facility.h> #define CPU_MF_INT_SF_IAE (1 << 31) /* invalid entry address */ |