From: David S. Miller <davem@davemloft.net>
Date: Sat, 9 Apr 2016 21:41:41 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: MMI-PSA29.97-13-9~7934^2~321
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ae95d7126104591348d37aaf78c8325967e02386;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge git://git./linux/kernel/git/davem/net
---

ae95d7126104591348d37aaf78c8325967e02386
diff --cc samples/bpf/Makefile
index 9959771bf808,b820cc96a3bc..744dd7a16144
--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
@@@ -79,13 -75,9 +79,10 @@@ HOSTLOADLIBES_lathist += -lel
  HOSTLOADLIBES_offwaketime += -lelf
  HOSTLOADLIBES_spintest += -lelf
  HOSTLOADLIBES_map_perf_test += -lelf -lrt
 +HOSTLOADLIBES_test_overhead += -lelf -lrt
  
- # point this to your LLVM backend with bpf support
- LLC=$(srctree)/tools/bpf/llvm/bld/Debug+Asserts/bin/llc
- 
- # asm/sysreg.h inline assmbly used by it is incompatible with llvm.
- # But, ehere is not easy way to fix it, so just exclude it since it is
+ # asm/sysreg.h - inline assembly used by it is incompatible with llvm.
+ # But, there is no easy way to fix it, so just exclude it since it is
  # useless for BPF samples.
  $(obj)/%.o: $(src)/%.c
  	clang $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(EXTRA_CFLAGS) \