Permalink
Browse files

Merge branch 'master' into pirate

  • Loading branch information...
2 parents b749624 + 5fff118 commit 6e0b76f06c462cc7c242ea80584c193a467fbfab @andysan committed Mar 19, 2013
Showing with 4 additions and 1 deletion.
  1. +4 −1 Makefile
View
5 Makefile
@@ -6,7 +6,10 @@ KERNEL_SRC=/lib/modules/$(KERNEL_RELEASE)/source
# Check if perf_event there is a perf_event.h available in the source
# of the running kernel. In that case, assume that it's newer and use
# that.
-ifneq ($(wildcard $(KERNEL_SRC)/include/linux/perf_event.h),)
+ifneq ($(wildcard $(KERNEL_SRC)/include/uapi/linux/perf_event.h),)
+ PERF_EVENT_H=$(KERNEL_SRC)/include/uapi/linux/perf_event.h
+ CONFIG+=-DPERFH=\"$(PERF_EVENT_H)\"
+else ifneq ($(wildcard $(KERNEL_SRC)/include/linux/perf_event.h),)
PERF_EVENT_H=$(KERNEL_SRC)/include/linux/perf_event.h
CONFIG+=-DPERFH=\"$(PERF_EVENT_H)\"
else

0 comments on commit 6e0b76f

Please sign in to comment.