Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e43d100 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bpf-misc-cleanups' 



Alexander Alemayhu says:

====================
Misc BPF cleanup

while looking into making the Makefile in samples/bpf better handle O= I saw
several warnings when running `make clean && make samples/bpf/`. This series
reduces those warnings.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e390b55d dfc5be0d

samples/bpf/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -189,4 +189,5 @@ $(obj)/%.o: $(src)/%.c 
		-Wno-compare-distinct-pointer-types \

		-Wno-gnu-variable-sized-type-not-at-end \

		-Wno-address-of-packed-member -Wno-tautological-compare \

		-Wno-unknown-warning-option \

		-O2 -emit-llvm -c $< -o -| $(LLC) -march=bpf -filetype=obj -o $@

samples/bpf/cookie_uid_helper_example.c

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static int usage(void) 
	return 1;

}



void finish(int ret)

static void finish(int ret)

{

	test_finish = true;

}

samples/bpf/test_lru_dist.c

+3 −1
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ 
#include "bpf_util.h"



#define min(a, b) ((a) < (b) ? (a) : (b))

#ifndef offsetof

# define offsetof(TYPE, MEMBER)	((size_t)&((TYPE *)0)->MEMBER)

#endif

#define container_of(ptr, type, member) ({			\

	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\

	(type *)( (char *)__mptr - offsetof(type,member) );})