From 8999b2f610e84a2413dbea1717fe6e2ebcd1eea0 Mon Sep 17 00:00:00 2001

From: William Findlay <william@williamfindlay.com>

Date: Wed, 17 Jun 2020 18:59:43 -0400

Subject: [PATCH] Delete existing kbuild_modname definitions

---

 examples/networking/xdp/xdp_drop_count.py    | 1 -

 examples/networking/xdp/xdp_macswap_count.py | 1 -

 examples/networking/xdp/xdp_redirect_cpu.py  | 1 -

 examples/networking/xdp/xdp_redirect_map.py  | 1 -

 examples/tracing/nflatency.py                | 1 -

 tests/python/test_clang.py                   | 8 --------

 tools/tcplife.lua                            | 1 -

 tools/tcplife.py                             | 1 -

 tools/tcpstates.py                           | 1 -

 9 files changed, 16 deletions(-)

diff --git a/examples/networking/xdp/xdp_drop_count.py b/examples/networking/xdp/xdp_drop_count.py

index f03273e9..512e0a20 100755

--- a/examples/networking/xdp/xdp_drop_count.py

+++ b/examples/networking/xdp/xdp_drop_count.py

@@ -52,7 +52,6 @@ mode = BPF.XDP

 # load BPF program

 b = BPF(text = """

-#define KBUILD_MODNAME "foo"

 #include <uapi/linux/bpf.h>

 #include <linux/in.h>

 #include <linux/if_ether.h>

diff --git a/examples/networking/xdp/xdp_macswap_count.py b/examples/networking/xdp/xdp_macswap_count.py

index 0e2b21ca..770ce8ca 100755

--- a/examples/networking/xdp/xdp_macswap_count.py

+++ b/examples/networking/xdp/xdp_macswap_count.py

@@ -50,7 +50,6 @@ mode = BPF.XDP

 # load BPF program

 b = BPF(text = """

-#define KBUILD_MODNAME "foo"

 #include <uapi/linux/bpf.h>

 #include <linux/in.h>

 #include <linux/if_ether.h>

diff --git a/examples/networking/xdp/xdp_redirect_cpu.py b/examples/networking/xdp/xdp_redirect_cpu.py

index 15b0d09b..470079f4 100755

--- a/examples/networking/xdp/xdp_redirect_cpu.py

+++ b/examples/networking/xdp/xdp_redirect_cpu.py

@@ -30,7 +30,6 @@ max_cpu = cpu_count()

 # load BPF program

 b = BPF(text = """

-#define KBUILD_MODNAME "foo"

 #include <uapi/linux/bpf.h>

 #include <linux/in.h>

 #include <linux/if_ether.h>

diff --git a/examples/networking/xdp/xdp_redirect_map.py b/examples/networking/xdp/xdp_redirect_map.py

index 4a622723..4936ac1e 100755

--- a/examples/networking/xdp/xdp_redirect_map.py

+++ b/examples/networking/xdp/xdp_redirect_map.py

@@ -29,7 +29,6 @@ out_idx = ip.link_lookup(ifname=out_if)[0]

 # load BPF program

 b = BPF(text = """

-#define KBUILD_MODNAME "foo"

 #include <uapi/linux/bpf.h>

 #include <linux/in.h>

 #include <linux/if_ether.h>

diff --git a/examples/tracing/nflatency.py b/examples/tracing/nflatency.py

index 76716490..c201930a 100755

--- a/examples/tracing/nflatency.py

+++ b/examples/tracing/nflatency.py

@@ -12,7 +12,6 @@ import time

 from bcc import BPF

 BPF_SRC = """

-#define KBUILD_MODNAME "bpf_hook_nflatency"

 #include <linux/ip.h>

 #include <linux/ipv6.h>

 #include <linux/tcp.h>

diff --git a/tests/python/test_clang.py b/tests/python/test_clang.py

index 886eebed..648494cf 100755

--- a/tests/python/test_clang.py

+++ b/tests/python/test_clang.py

@@ -78,7 +78,6 @@ int count_foo(struct pt_regs *ctx, unsigned long a, unsigned long b) {

     def test_probe_read3(self):

         text = """

-#define KBUILD_MODNAME "foo"

 #include <net/tcp.h>

 #define _(P) ({typeof(P) val = 0; bpf_probe_read(&val, sizeof(val), &P); val;})

 int count_tcp(struct pt_regs *ctx, struct sk_buff *skb) {

@@ -90,7 +89,6 @@ int count_tcp(struct pt_regs *ctx, struct sk_buff *skb) {

     def test_probe_read4(self):

         text = """

-#define KBUILD_MODNAME "foo"

 #include <net/tcp.h>

 #define _(P) ({typeof(P) val = 0; bpf_probe_read(&val, sizeof(val), &P); val;})

 int test(struct pt_regs *ctx, struct sk_buff *skb) {

@@ -102,7 +100,6 @@ int test(struct pt_regs *ctx, struct sk_buff *skb) {

     def test_probe_read_whitelist1(self):

         text = """

-#define KBUILD_MODNAME "foo"

 #include <net/tcp.h>

 int count_tcp(struct pt_regs *ctx, struct sk_buff *skb) {

     // The below define is in net/tcp.h:

@@ -120,7 +117,6 @@ int count_tcp(struct pt_regs *ctx, struct sk_buff *skb) {

     def test_probe_read_whitelist2(self):

         text = """

-#define KBUILD_MODNAME "foo"

 #include <net/tcp.h>

 int count_tcp(struct pt_regs *ctx, struct sk_buff *skb) {

     // The below define is in net/tcp.h:

@@ -1072,7 +1068,6 @@ int test(struct __sk_buff *ctx) {

     def test_probe_read_return(self):

         text = """

-#define KBUILD_MODNAME "foo"

 #include <uapi/linux/ptrace.h>

 #include <linux/tcp.h>

 static inline unsigned char *my_skb_transport_header(struct sk_buff *skb) {

@@ -1088,7 +1083,6 @@ int test(struct pt_regs *ctx, struct sock *sk, struct sk_buff *skb) {

     def test_probe_read_multiple_return(self):

         text = """

-#define KBUILD_MODNAME "foo"

 #include <uapi/linux/ptrace.h>

 #include <linux/tcp.h>

 static inline u64 error_function() {

@@ -1109,7 +1103,6 @@ int test(struct pt_regs *ctx, struct sock *sk, struct sk_buff *skb) {

     def test_probe_read_return_expr(self):

         text = """

-#define KBUILD_MODNAME "foo"

 #include <uapi/linux/ptrace.h>

 #include <linux/tcp.h>

 static inline unsigned char *my_skb_transport_header(struct sk_buff *skb) {

@@ -1125,7 +1118,6 @@ int test(struct pt_regs *ctx, struct sock *sk, struct sk_buff *skb) {

     def test_probe_read_return_call(self):

         text = """

-#define KBUILD_MODNAME "foo"

 #include <uapi/linux/ptrace.h>

 #include <linux/tcp.h>

 static inline struct tcphdr *my_skb_transport_header(struct sk_buff *skb) {

diff --git a/tools/tcplife.lua b/tools/tcplife.lua

index 3f4f6afd..5e311631 100755

--- a/tools/tcplife.lua

+++ b/tools/tcplife.lua

@@ -25,7 +25,6 @@ uint16_t ntohs(uint16_t netshort);

 local program = [[

 #include <uapi/linux/ptrace.h>

-#define KBUILD_MODNAME "foo"

 #include <linux/tcp.h>

 #include <net/sock.h>

 #include <bcc/proto.h>

diff --git a/tools/tcplife.py b/tools/tcplife.py

index d4e679dd..c2bd8236 100755

--- a/tools/tcplife.py

+++ b/tools/tcplife.py

@@ -66,7 +66,6 @@ debug = 0

 # define BPF program

 bpf_text = """

 #include <uapi/linux/ptrace.h>

-#define KBUILD_MODNAME "foo"

 #include <linux/tcp.h>

 #include <net/sock.h>

 #include <bcc/proto.h>

diff --git a/tools/tcpstates.py b/tools/tcpstates.py

index 48f87884..0fe5d89a 100755

--- a/tools/tcpstates.py

+++ b/tools/tcpstates.py

@@ -61,7 +61,6 @@ debug = 0

 # define BPF program

 bpf_header = """

 #include <uapi/linux/ptrace.h>

-#define KBUILD_MODNAME "foo"

 #include <linux/tcp.h>

 #include <net/sock.h>

 #include <bcc/proto.h>

-- 

2.25.4