asm-generic/barrier.h and asm/bitops.h are already brought into the file through the header linux/sunrpc/svc_rdma.h and the file can still be built with their removal. They have been replaced with the preferred linux/bitops.h and asm/barrier.h to remove the need for the asm-generic header. Suggested-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Signed-off-by: Tanzir Hasan <tanzirh@xxxxxxxxxx> --- Changes in v2: - Added asm/barrier.h and linux/bitops.h to not conflict with rule 1 of submit-checklist - Link to v1: https://lore.kernel.org/r/20231226-verbs-v1-1-3a2cecf11afd@xxxxxxxxxx --- net/sunrpc/xprtrdma/verbs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 28c0771c4e8c..b4c1d874fc7e 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -49,14 +49,14 @@ * o buffer memory */ +#include <linux/bitops.h> #include <linux/interrupt.h> #include <linux/slab.h> #include <linux/sunrpc/addr.h> #include <linux/sunrpc/svc_rdma.h> #include <linux/log2.h> -#include <asm-generic/barrier.h> -#include <asm/bitops.h> +#include <asm/barrier.h> #include <rdma/ib_cm.h> --- base-commit: fbafc3e621c3f4ded43720fdb1d6ce1728ec664e change-id: 20231226-verbs-30800631d3f1 Best regards, -- Tanzir Hasan <tanzirh@xxxxxxxxxx>
