Skip to content

Commit

Permalink
bcachefs fix module compilation
Browse files Browse the repository at this point in the history
Signed-off-by: Peter Jung <[email protected]>
  • Loading branch information
ptr1337 committed Jul 22, 2022
1 parent c1fe6e4 commit dee821f
Showing 1 changed file with 34 additions and 3 deletions.
37 changes: 34 additions & 3 deletions 5.18/0001-bcachefs-after-lru.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From db5737e931d295bf4d123b5368a2fef3958641d6 Mon Sep 17 00:00:00 2001
From 5b13fe4d30654e4d60514bcae59adbd1e4c408e2 Mon Sep 17 00:00:00 2001
From: Peter Jung <[email protected]>
Date: Fri, 22 Jul 2022 14:09:10 +0200
Subject: [PATCH 16/16] bcachefs-after-lru
Subject: [PATCH] bcachefs-after-lru

Signed-off-by: Peter Jung <[email protected]>
---
Expand Down Expand Up @@ -215,6 +215,7 @@ Signed-off-by: Peter Jung <[email protected]>
kernel/locking/lockdep.c | 20 +
kernel/locking/six.c | 759 ++++
kernel/module/main.c | 4 +-
kernel/stacktrace.c | 2 +
kernel/trace/trace.c | 45 +-
kernel/trace/trace_dynevent.c | 34 +-
kernel/trace/trace_events_filter.c | 2 +-
Expand All @@ -226,6 +227,7 @@ Signed-off-by: Peter Jung <[email protected]>
lib/Kconfig.debug | 9 +
lib/Makefile | 8 +-
{drivers/md/bcache => lib}/closure.c | 35 +-
lib/errname.c | 1 +
lib/generic-radix-tree.c | 76 +-
lib/hexdump.c | 246 +-
lib/pretty-printers.c | 60 +
Expand All @@ -251,7 +253,7 @@ Signed-off-by: Peter Jung <[email protected]>
net/9p/trans_virtio.c | 4 +-
net/9p/trans_xen.c | 2 +-
tools/testing/nvdimm/test/ndtest.c | 22 +-
246 files changed, 84379 insertions(+), 2223 deletions(-)
248 files changed, 84382 insertions(+), 2223 deletions(-)
create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
create mode 100644 fs/bcachefs/Kconfig
create mode 100644 fs/bcachefs/Makefile
Expand Down Expand Up @@ -85584,6 +85586,26 @@ index 31d83ee88462..69a6916645c5 100644
}

bool __weak module_init_section(const char *name)
diff --git a/kernel/stacktrace.c b/kernel/stacktrace.c
index 9ed5ce989415..3428568bb3f1 100644
--- a/kernel/stacktrace.c
+++ b/kernel/stacktrace.c
@@ -151,6 +151,7 @@ unsigned int stack_trace_save_tsk(struct task_struct *tsk, unsigned long *store,
put_task_stack(tsk);
return c.len;
}
+EXPORT_SYMBOL(stack_trace_save_tsk);

/**
* stack_trace_save_regs - Save a stack trace based on pt_regs into a storage array
@@ -301,6 +302,7 @@ unsigned int stack_trace_save_tsk(struct task_struct *task,
save_stack_trace_tsk(task, &trace);
return trace.nr_entries;
}
+EXPORT_SYMBOL(stack_trace_save_tsk);

/**
* stack_trace_save_regs - Save a stack trace based on pt_regs into a storage array
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index a2e44354b63a..5f3cce1b52ef 100644
--- a/kernel/trace/trace.c
Expand Down Expand Up @@ -86376,6 +86398,15 @@ index d8d9394a6beb..b38ded00b9b0 100644
-MODULE_AUTHOR("Kent Overstreet <[email protected]>");
-MODULE_LICENSE("GPL");
+#endif
diff --git a/lib/errname.c b/lib/errname.c
index 05cbf731545f..82ea4778f478 100644
--- a/lib/errname.c
+++ b/lib/errname.c
@@ -222,3 +222,4 @@ const char *errname(int err)

return err > 0 ? name + 1 : name;
}
+EXPORT_SYMBOL(errname);
diff --git a/lib/generic-radix-tree.c b/lib/generic-radix-tree.c
index f25eb111c051..41f1bcdc4488 100644
--- a/lib/generic-radix-tree.c
Expand Down

0 comments on commit dee821f

Please sign in to comment.