Re: linux-next: build failure after merge of the rcu tree

From: Stephen Rothwell
Date: Tue Aug 13 2019 - 01:25:21 EST


Hi Paul,

On Mon, 12 Aug 2019 09:19:34 -0700 "Paul E. McKenney" <paulmck@xxxxxxxxxxxxx> wrote:
>
> Huh. "It has been building fine for me." I added
>
> #include <uapi/asm-generic/types.h>
> #include <asm-generic/atomic-long.h>
>
> to include/linux/rcu_segcblist.h, which hopefully fixes it at your end.

That did not work as I got a lot of errors from
include/asm-generic/atomic-long.h. I have added the following patch
for today (which does build). These errors come from having
CONFIG_{,KERNEL_,UAPI_}HEADER_TEST set (which allmodconfig a should do).

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 13 Aug 2019 15:12:00 +1000
Subject: [PATCH] rcu: use the correct includes

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
include/linux/rcu_segcblist.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/rcu_segcblist.h b/include/linux/rcu_segcblist.h
index 43e2935e8966..646759042333 100644
--- a/include/linux/rcu_segcblist.h
+++ b/include/linux/rcu_segcblist.h
@@ -14,8 +14,8 @@
#ifndef __INCLUDE_LINUX_RCU_SEGCBLIST_H
#define __INCLUDE_LINUX_RCU_SEGCBLIST_H

-#include <uapi/asm-generic/types.h>
-#include <asm-generic/atomic-long.h>
+#include <linux/types.h>
+#include <linux/atomic.h>

/* Simple unsegmented callback lists. */
struct rcu_cblist {
--
2.20.1

--
Cheers,
Stephen Rothwell

Attachment: pgpIk9eZDT9bo.pgp
Description: OpenPGP digital signature