Hi all, After merging the net-next tree, today's linux-next build (x86_64 allmodconfig) failed like this:
net/xdp/xsk_buff_pool.c:7:10: fatal error: linux/dma-noncoherent.h: No such
file or directory
7 | #include <linux/dma-noncoherent.h>
| ^~~~~~~~~~~~~~~~~~~~~~~~~
Caused by commit
1c1efc2af158 ("xsk: Create and free buffer pool independently from umem")
interacting with commit
a3cf77774abf ("dma-mapping: merge <linux/dma-noncoherent.h> into
<linux/dma-map-ops.h>")
from the dma-mapping tree.
I have applied teh following merge fix patch.
From: Stephen Rothwell <s...@canb.auug.org.au>
Date: Tue, 6 Oct 2020 14:53:30 +1100
Subject: [PATCH] xsk: fix up for "dma-mapping: merge <linux/dma-noncoherent.h>
into <linux/dma-map-ops.h>"
Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au>
---
net/xdp/xsk_buff_pool.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c
index e63fadd000db..dbed16648607 100644
--- a/net/xdp/xsk_buff_pool.c
+++ b/net/xdp/xsk_buff_pool.c
@@ -4,7 +4,7 @@
#include <net/xdp_sock.h>
#include <net/xdp_sock_drv.h>
#include <linux/dma-direct.h>
-#include <linux/dma-noncoherent.h>
+#include <linux/dma-map-ops.h>
#include <linux/swiotlb.h>
#include "xsk_queue.h"
--
2.28.0
--
Cheers,
Stephen Rothwell
pgpPL4UxZFV8z.pgp
Description: OpenPGP digital signature
