Merge branch 'linus' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Ingo Molnar 2018-01-06 12:07:10 +01:00
commit b6815f3545
579 changed files with 7820 additions and 2915 deletions

View file

@ -2,7 +2,7 @@
#ifndef _UAPI__ASM_BPF_PERF_EVENT_H__
#define _UAPI__ASM_BPF_PERF_EVENT_H__
#include <asm/ptrace.h>
#include "ptrace.h"
typedef user_pt_regs bpf_user_pt_regs_t;