Merge tag 'f2fs-for-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeu...

[linux-2.6-microblaze.git] / samples / bpf / offwaketime_kern.c

diff --git a/samples/bpf/offwaketime_kern.c b/samples/bpf/offwaketime_kern.c
index e74ee1c..4866afd 100644 (file)
--- a/samples/bpf/offwaketime_kern.c
+++ b/samples/bpf/offwaketime_kern.c
@@ -20,6 +20,7 @@
        })
 
 #define MINBLOCK_US    1
+#define MAX_ENTRIES    10000
 
 struct key_t {
        char waker[TASK_COMM_LEN];
@@ -28,38 +29,38 @@ struct key_t {
        u32 tret;
 };
 
-struct bpf_map_def SEC("maps") counts = {
-       .type = BPF_MAP_TYPE_HASH,
-       .key_size = sizeof(struct key_t),
-       .value_size = sizeof(u64),
-       .max_entries = 10000,
-};
+struct {
+       __uint(type, BPF_MAP_TYPE_HASH);
+       __type(key, struct key_t);
+       __type(value, u64);
+       __uint(max_entries, MAX_ENTRIES);
+} counts SEC(".maps");
 
-struct bpf_map_def SEC("maps") start = {
-       .type = BPF_MAP_TYPE_HASH,
-       .key_size = sizeof(u32),
-       .value_size = sizeof(u64),
-       .max_entries = 10000,
-};
+struct {
+       __uint(type, BPF_MAP_TYPE_HASH);
+       __type(key, u32);
+       __type(value, u64);
+       __uint(max_entries, MAX_ENTRIES);
+} start SEC(".maps");
 
 struct wokeby_t {
        char name[TASK_COMM_LEN];
        u32 ret;
 };
 
-struct bpf_map_def SEC("maps") wokeby = {
-       .type = BPF_MAP_TYPE_HASH,
-       .key_size = sizeof(u32),
-       .value_size = sizeof(struct wokeby_t),
-       .max_entries = 10000,
-};
-
-struct bpf_map_def SEC("maps") stackmap = {
-       .type = BPF_MAP_TYPE_STACK_TRACE,
-       .key_size = sizeof(u32),
-       .value_size = PERF_MAX_STACK_DEPTH * sizeof(u64),
-       .max_entries = 10000,
-};
+struct {
+       __uint(type, BPF_MAP_TYPE_HASH);
+       __type(key, u32);
+       __type(value, struct wokeby_t);
+       __uint(max_entries, MAX_ENTRIES);
+} wokeby SEC(".maps");
+
+struct {
+       __uint(type, BPF_MAP_TYPE_STACK_TRACE);
+       __uint(key_size, sizeof(u32));
+       __uint(value_size, PERF_MAX_STACK_DEPTH * sizeof(u64));
+       __uint(max_entries, MAX_ENTRIES);
+} stackmap SEC(".maps");
 
 #define STACKID_FLAGS (0 | BPF_F_FAST_STACK_CMP)