Merge branch 'master' into tracing

Author: netoptimizer

common/Makefile

@@ -6,7 +6,7 @@ all: common_params.o common_user_bpf_xdp.o common_libbpf.o
 CFLAGS := -g -Wall
 
 LIBBPF_DIR = ../libbpf/src/
-CFLAGS += -I$(LIBBPF_DIR)/root/usr/include/
+CFLAGS += -I$(LIBBPF_DIR)/root/usr/include/  -I../headers
 # TODO: Do we need to make libbpf from this make file too?
 
 common_params.o: common_params.c common_params.h

common/common.mk

@@ -39,6 +39,8 @@ EXTRA_DEPS +=
 KERN_USER_H ?= $(wildcard common_kern_user.h)
 
 CFLAGS ?= -I$(LIBBPF_DIR)/root/usr/include/ -g
+# Extra include for Ubuntu issue #44
+CFLAGS += -I/usr/include/x86_64-linux-gnu
 CFLAGS += -I../headers/
 LDFLAGS ?= -L$(LIBBPF_DIR)
 

headers/bpf_helpers.h

@@ -1,5 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /* Copied from $(LINUX)/tools/testing/selftests/bpf/bpf_helpers.h */
+
+/* Added to fix compilation on old Ubuntu systems - please preserve when
+   updating file! */
+#ifndef __always_inline
+# define __always_inline	inline __attribute__((always_inline))
+#endif
+
 #ifndef __BPF_HELPERS_H
 #define __BPF_HELPERS_H