diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-01 22:21:09 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-08-01 22:21:09 +0200 |
| commit | 8de4131b2ddd11faa3394cf497484563068c9e7a (patch) | |
| tree | ed4ed9e586c7236f09c109afdd416dac18ba8cc3 /gnu/packages/patches/netdde-build-fix.patch | |
| parent | 15406013fe63f2ab238eec2d7a8adbc586806ac8 (diff) | |
| parent | 45b7a8bfda5bde2e2daee4bec0ca092cd719d726 (diff) | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'gnu/packages/patches/netdde-build-fix.patch')
| -rw-r--r-- | gnu/packages/patches/netdde-build-fix.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gnu/packages/patches/netdde-build-fix.patch b/gnu/packages/patches/netdde-build-fix.patch new file mode 100644 index 0000000000..f7f0fc35a9 --- /dev/null +++ b/gnu/packages/patches/netdde-build-fix.patch @@ -0,0 +1,28 @@ +Upstream status: Presented upstream. + + https://lists.gnu.org/archive/html/bug-hurd/2023-05//msg00449.html + +From b0a7e4f2706bea8d1c80d5af7a095941f9635033 Mon Sep 17 00:00:00 2001 +From: Janneke Nieuwenhuizen <janneke@gnu.org> +Date: Fri, 26 May 2023 17:39:17 +0200 +Subject: [PATCH] Update for .../rumpdisk: Fix race condition in bootstrap + +--- + machdev.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/machdev.c b/machdev.c +index dda5eb8ba..1a6811072 100644 +--- a/machdev.c ++++ b/machdev.c +@@ -18,5 +18,6 @@ void machdev_run1 (void *arg) + + void machdev_run2(void) + { +- machdev_trivfs_server(bootstrap); ++ machdev_trivfs_server_startup(bootstrap); ++ machdev_trivfs_server_loop(NULL); + } +-- +2.40.1 + |