On Mon, Jul 22, 2019 at 9:30 PM Heiko Carstens
<heiko.carstens@xxxxxxxxxx> wrote:
>
> On Sun, Jul 21, 2019 at 11:20:08PM +0900, Masahiro Yamada wrote:
> > When CONFIG_UAPI_HEADER_TEST=y, exported headers are compile-tested to
> > make sure they can be included from user-space.
> >
> > Currently, zcrypt.h is excluded from the test coverage. To make it
> > join the compile-test, we need to fix the build errors attached below.
> >
> > For a case like this, we decided to use __u{8,16,32,64} variable types
> > in this discussion:
> >
> > https://lkml.org/lkml/2019/6/5/18
> ...
> > Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
> > ---
> >
> > arch/s390/include/uapi/asm/zcrypt.h | 35 +++++++++++++++--------------
> > 1 file changed, 18 insertions(+), 17 deletions(-)
>
> Applied, thanks!
Thanks.
> I also added the patch below:
>
> From b312d5e2244f635f83cbf19b850e26c1c443f465 Mon Sep 17 00:00:00 2001
> From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
> Date: Mon, 22 Jul 2019 14:16:46 +0200
> Subject: [PATCH 2/2] kbuild: enable arch/s390/include/uapi/asm/zcrypt.h for
> uapi header test
>
> Masahiro Yamada changed the zcrypt.h header file to use __u{16,32,64}
> instead of uint{16,32,64}_t with ("s390: use __u{16,32,64} instead of
> uint{16,32,64}_t in uapi header").
>
> This makes all s390 header files pass - remove zcrypt.h from the blacklist.
>
> Cc: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
> Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Yeah, I had noticed this.
I am sending out various patches to various subsystems.
To avoid potential conflicts, my plan was to sync the blacklist
from time to time, like the following commit:
commit 67bf47452ea00edd90e796054229b651e64b82c1
Author: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
Date: Wed Jul 17 15:29:13 2019 +0900
kbuild: update compile-test header list for v5.3-rc1
For this particular case, probably a merge conflict will not happen,
so either is fine.
> ---
> usr/include/Makefile | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/usr/include/Makefile b/usr/include/Makefile
> index aa316d99e035..1fb6abe29b2f 100644
> --- a/usr/include/Makefile
> +++ b/usr/include/Makefile
> @@ -101,10 +101,6 @@ ifeq ($(SRCARCH),riscv)
> header-test- += linux/bpf_perf_event.h
> endif
>
> -ifeq ($(SRCARCH),s390)
> -header-test- += asm/zcrypt.h
> -endif
> -
> ifeq ($(SRCARCH),sparc)
> header-test- += asm/stat.h
> header-test- += asm/uctx.h
> --
> 2.17.1
>
--
Best Regards
Masahiro Yamada
