Merge tag 'for-linus-5.4-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubca...

[linux.git] / samples / bpf / bpf_load.c

diff --git a/samples/bpf/bpf_load.c b/samples/bpf/bpf_load.c
index 6e87cc831e84287170f4ec77d8eb890e587cad6c..4574b1939e49b137d9086ec719080d6cd73c91ef 100644 (file)
--- a/samples/bpf/bpf_load.c
+++ b/samples/bpf/bpf_load.c
@@ -40,7 +40,7 @@ int prog_cnt;
 int prog_array_fd = -1;
 
 struct bpf_map_data map_data[MAX_MAPS];
-int map_data_count = 0;
+int map_data_count;
 
 static int populate_prog_array(const char *event, int prog_fd)
 {
@@ -65,7 +65,7 @@ static int write_kprobe_events(const char *val)
        else
                flags = O_WRONLY | O_APPEND;
 
-       fd = open("/sys/kernel/debug/tracing/kprobe_events", flags);
+       fd = open(DEBUGFS "kprobe_events", flags);
 
        ret = write(fd, val, strlen(val));
        close(fd);
@@ -490,8 +490,8 @@ static int load_elf_maps_section(struct bpf_map_data *maps, int maps_shndx,
 
                /* Verify no newer features were requested */
                if (validate_zero) {
-                       addr = (unsigned char*) def + map_sz_copy;
-                       end  = (unsigned char*) def + map_sz_elf;
+                       addr = (unsigned char *) def + map_sz_copy;
+                       end  = (unsigned char *) def + map_sz_elf;
                        for (; addr < end; addr++) {
                                if (*addr != 0) {
                                        free(sym);