diff --git a/[refs] b/[refs] index 71087323f9f3..84881443e73b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e78505958cf123048fb48cb56b79cebb8edd15fb +refs/heads/master: 7be7923633a142402266d642ccebf74f556a649b diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h index 7342979f95f2..1218d05728b9 100644 --- a/trunk/include/linux/perf_event.h +++ b/trunk/include/linux/perf_event.h @@ -462,6 +462,7 @@ enum perf_callchain_context { #ifdef CONFIG_PERF_EVENTS # include +# include #endif struct perf_guest_info_callbacks { @@ -487,7 +488,6 @@ struct perf_guest_info_callbacks { #include #include #include -#include #define PERF_MAX_STACK_DEPTH 255