2020-04-22 05:44:24

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the powerpc tree

Hi all,

After merging the powerpc tree, today's linux-next build (powerpc
allyesconfig) failed like this:

In file included from <command-line>:32:
./usr/include/asm/vas-api.h:15:2: error: unknown type name '__u32'
15 | __u32 version;
| ^~~~~
./usr/include/asm/vas-api.h:16:2: error: unknown type name '__s16'
16 | __s16 vas_id; /* specific instance of vas or -1 for default */
| ^~~~~
./usr/include/asm/vas-api.h:17:2: error: unknown type name '__u16'
17 | __u16 reserved1;
| ^~~~~
./usr/include/asm/vas-api.h:18:2: error: unknown type name '__u64'
18 | __u64 flags; /* Future use */
| ^~~~~
./usr/include/asm/vas-api.h:19:2: error: unknown type name '__u64'
19 | __u64 reserved2[6];
| ^~~~~

Caused by commit

45f25a79fe50 ("powerpc/vas: Define VAS_TX_WIN_OPEN ioctl API")

uapi headers should be self contained. I have added the following patch
for today:

From: Stephen Rothwell <[email protected]>
Date: Wed, 22 Apr 2020 15:28:26 +1000
Subject: [PATCH] powerpc/vas: uapi headers should be self contained

Signed-off-by: Stephen Rothwell <[email protected]>
---
arch/powerpc/include/uapi/asm/vas-api.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/powerpc/include/uapi/asm/vas-api.h b/arch/powerpc/include/uapi/asm/vas-api.h
index fe95d67e3bab..ebd4b2424785 100644
--- a/arch/powerpc/include/uapi/asm/vas-api.h
+++ b/arch/powerpc/include/uapi/asm/vas-api.h
@@ -6,6 +6,8 @@
#ifndef _UAPI_MISC_VAS_H
#define _UAPI_MISC_VAS_H

+#include <linux/types.h>
+
#include <asm/ioctl.h>

#define VAS_MAGIC 'v'
--
2.25.1

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2020-04-22 06:37:01

by Haren Myneni

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the powerpc tree

Stephen, Sorry missed it. Thanks for fixing it.

Acked-by: Haren Myneni <[email protected]>

On 4/21/20 10:41 PM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the powerpc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> In file included from <command-line>:32:
> ./usr/include/asm/vas-api.h:15:2: error: unknown type name '__u32'
> 15 | __u32 version;
> | ^~~~~
> ./usr/include/asm/vas-api.h:16:2: error: unknown type name '__s16'
> 16 | __s16 vas_id; /* specific instance of vas or -1 for default */
> | ^~~~~
> ./usr/include/asm/vas-api.h:17:2: error: unknown type name '__u16'
> 17 | __u16 reserved1;
> | ^~~~~
> ./usr/include/asm/vas-api.h:18:2: error: unknown type name '__u64'
> 18 | __u64 flags; /* Future use */
> | ^~~~~
> ./usr/include/asm/vas-api.h:19:2: error: unknown type name '__u64'
> 19 | __u64 reserved2[6];
> | ^~~~~
>
> Caused by commit
>
> 45f25a79fe50 ("powerpc/vas: Define VAS_TX_WIN_OPEN ioctl API")
>
> uapi headers should be self contained. I have added the following patch
> for today:
>
> From: Stephen Rothwell <[email protected]>
> Date: Wed, 22 Apr 2020 15:28:26 +1000
> Subject: [PATCH] powerpc/vas: uapi headers should be self contained
>
> Signed-off-by: Stephen Rothwell <[email protected]>> ---
> arch/powerpc/include/uapi/asm/vas-api.h | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/powerpc/include/uapi/asm/vas-api.h b/arch/powerpc/include/uapi/asm/vas-api.h
> index fe95d67e3bab..ebd4b2424785 100644
> --- a/arch/powerpc/include/uapi/asm/vas-api.h
> +++ b/arch/powerpc/include/uapi/asm/vas-api.h
> @@ -6,6 +6,8 @@
> #ifndef _UAPI_MISC_VAS_H
> #define _UAPI_MISC_VAS_H
>
> +#include <linux/types.h>
> +
> #include <asm/ioctl.h>
>
> #define VAS_MAGIC 'v'
>

2020-04-25 23:54:53

by Michael Ellerman

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the powerpc tree

On Wed, 2020-04-22 at 05:41:29 UTC, Stephen Rothwell wrote:
> Hi all,
>
> After merging the powerpc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> In file included from <command-line>:32:
> ./usr/include/asm/vas-api.h:15:2: error: unknown type name '__u32'
> 15 | __u32 version;
> | ^~~~~
> ./usr/include/asm/vas-api.h:16:2: error: unknown type name '__s16'
> 16 | __s16 vas_id; /* specific instance of vas or -1 for default */
> | ^~~~~
> ./usr/include/asm/vas-api.h:17:2: error: unknown type name '__u16'
> 17 | __u16 reserved1;
> | ^~~~~
> ./usr/include/asm/vas-api.h:18:2: error: unknown type name '__u64'
> 18 | __u64 flags; /* Future use */
> | ^~~~~
> ./usr/include/asm/vas-api.h:19:2: error: unknown type name '__u64'
> 19 | __u64 reserved2[6];
> | ^~~~~
>
> Caused by commit
>
> 45f25a79fe50 ("powerpc/vas: Define VAS_TX_WIN_OPEN ioctl API")
>
> uapi headers should be self contained. I have added the following patch
> for today:
>
> From: Stephen Rothwell <[email protected]>
> Date: Wed, 22 Apr 2020 15:28:26 +1000
> Subject: [PATCH] powerpc/vas: uapi headers should be self contained
>
> Signed-off-by: Stephen Rothwell <[email protected]>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/45591da765885f7320a111d290b3a28a23eed359

cheers