git: 91e2614a7105 - main - Fix xdma_if.m in an ACPI only kernel
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 27 Oct 2022 16:24:22 UTC
The branch main has been updated by andrew:
URL: https://cgit.FreeBSD.org/src/commit/?id=91e2614a710520d023fd59108caa971d6e57e0d1
commit 91e2614a710520d023fd59108caa971d6e57e0d1
Author: Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2022-10-27 16:17:20 +0000
Commit: Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2022-10-27 16:17:20 +0000
Fix xdma_if.m in an ACPI only kernel
- We depend on header polution to include sys/malloc.h. Include it
directly.
- Only define FDT-specific fuctions when building a FDT kernel.
Sponsored by: Innovate UK
---
sys/dev/xdma/xdma_if.m | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sys/dev/xdma/xdma_if.m b/sys/dev/xdma/xdma_if.m
index 61c711d6e24a..b34b72bc5d42 100644
--- a/sys/dev/xdma/xdma_if.m
+++ b/sys/dev/xdma/xdma_if.m
@@ -32,6 +32,8 @@
#include "opt_platform.h"
+#include <sys/malloc.h>
+
#include <machine/bus.h>
#ifdef FDT
@@ -81,6 +83,7 @@ METHOD int channel_submit_sg {
uint32_t sg_n;
};
+#ifdef FDT
#
# Notify driver we have machine-dependend data.
#
@@ -90,6 +93,7 @@ METHOD int ofw_md_data {
int ncells;
void **data;
};
+#endif
#
# Allocate both virtual and harware channels.