bpf: Remove redundant ifdef

l0kod · davem330 · commit cdc6a4ba88fb · 2017-02-15T12:14:54.000-05:00
Remove a useless ifdef __NR_bpf as requested by Wang Nan. Inline one-line static functions as it was in the bpf_sys.h file. Signed-off-by: Mickaël Salaün <mic@digikod.net> Cc: Alexei Starovoitov <ast@fb.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: David S. Miller <davem@davemloft.net> Cc: Wang Nan <wangnan0@huawei.com> Link: https://lkml.kernel.org/r/828ab1ff-4dcf-53ff-c97b-074adb895006@huawei.com Acked-by: Wang Nan <wangnan0@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
@@ -42,21 +42,15 @@
 # endif
 #endif
 
-static __u64 ptr_to_u64(const void *ptr)
+static inline __u64 ptr_to_u64(const void *ptr)
 {
 	return (__u64) (unsigned long) ptr;
 }
 
-static int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr,
-		   unsigned int size)
+static inline int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr,
+			  unsigned int size)
 {
-#ifdef __NR_bpf
 	return syscall(__NR_bpf, cmd, attr, size);
-#else
-	fprintf(stderr, "No bpf syscall, kernel headers too old?\n");
-	errno = ENOSYS;
-	return -1;
-#endif
 }
 
 int bpf_create_map(enum bpf_map_type map_type, int key_size,

Original file line number	Diff line number	Diff line change
`@@ -42,21 +42,15 @@`
`42`	`42`	`# endif`
`43`	`43`	`#endif`
`44`	`44`
`45`		`-static __u64 ptr_to_u64(const void *ptr)`
	`45`	`+static inline __u64 ptr_to_u64(const void *ptr)`
`46`	`46`	`{`
`47`	`47`	`return (__u64) (unsigned long) ptr;`
`48`	`48`	`}`
`49`	`49`
`50`		`-static int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr,`
`51`		`- unsigned int size)`
	`50`	`+static inline int sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr,`
	`51`	`+ unsigned int size)`
`52`	`52`	`{`
`53`		`-#ifdef __NR_bpf`
`54`	`53`	`return syscall(__NR_bpf, cmd, attr, size);`
`55`		`-#else`
`56`		`- fprintf(stderr, "No bpf syscall, kernel headers too old?\n");`
`57`		`- errno = ENOSYS;`
`58`		`- return -1;`
`59`		`-#endif`
`60`	`54`	`}`
`61`	`55`
`62`	`56`	`int bpf_create_map(enum bpf_map_type map_type, int key_size,`