2020-11-23 19:22:57

by Randy Dunlap

Subject: [PATCH] zlib: export S390 symbols for zlib modules

Fix build errors when ZLIB_INFLATE=m and ZLIB_DEFLATE=m
and ZLIB_DFLTCC=y by exporting the 2 needed symbols in
dfltcc_inflate.c.

Fixes these build errors:

ERROR: modpost: "dfltcc_inflate" [lib/zlib_inflate/zlib_inflate.ko] undefined!
ERROR: modpost: "dfltcc_can_inflate" [lib/zlib_inflate/zlib_inflate.ko] undefined!

Fixes: 126196100063 ("lib/zlib: add s390 hardware support for kernel zlib_inflate")
Signed-off-by: Randy Dunlap <[email protected]>
Reported-by: kernel test robot <[email protected]>
Cc: Mikhail Zaslonko <[email protected]>
Cc: Ilya Leoshkevich <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Heiko Carstens <[email protected]>
Cc: Vasily Gorbik <[email protected]>
Cc: Christian Borntraeger <[email protected]>
Cc: [email protected]
---
lib/zlib_dfltcc/dfltcc_inflate.c | 3 +++
1 file changed, 3 insertions(+)

--- linux-next-20201120.orig/lib/zlib_dfltcc/dfltcc_inflate.c
+++ linux-next-20201120/lib/zlib_dfltcc/dfltcc_inflate.c
@@ -4,6 +4,7 @@
#include "dfltcc_util.h"
#include "dfltcc.h"
#include <asm/setup.h>
+#include <linux/export.h>
#include <linux/zutil.h>

/*
@@ -29,6 +30,7 @@ int dfltcc_can_inflate(
return is_bit_set(dfltcc_state->af.fns, DFLTCC_XPND) &&
is_bit_set(dfltcc_state->af.fmts, DFLTCC_FMT0);
}
+EXPORT_SYMBOL(dfltcc_can_inflate);

static int dfltcc_was_inflate_used(
z_streamp strm
@@ -147,3 +149,4 @@ dfltcc_inflate_action dfltcc_inflate(
return (cc == DFLTCC_CC_OP1_TOO_SHORT || cc == DFLTCC_CC_OP2_TOO_SHORT) ?
DFLTCC_INFLATE_BREAK : DFLTCC_INFLATE_CONTINUE;
}
+EXPORT_SYMBOL(dfltcc_inflate);

2020-11-23 19:23:44

by Ilya Leoshkevich

Subject: Re: [PATCH] zlib: export S390 symbols for zlib modules

On Mon, 2020-11-23 at 11:17 -0800, Randy Dunlap wrote:
> Fix build errors when ZLIB_INFLATE=m and ZLIB_DEFLATE=m
> and ZLIB_DFLTCC=y by exporting the 2 needed symbols in
> dfltcc_inflate.c.
>
> Fixes these build errors:
>
> ERROR: modpost: "dfltcc_inflate" [lib/zlib_inflate/zlib_inflate.ko]
> undefined!
> ERROR: modpost: "dfltcc_can_inflate"
> [lib/zlib_inflate/zlib_inflate.ko] undefined!
>
> Fixes: 126196100063 ("lib/zlib: add s390 hardware support for kernel
> zlib_inflate")
> Signed-off-by: Randy Dunlap <[email protected]>
> Reported-by: kernel test robot <[email protected]>
> Cc: Mikhail Zaslonko <[email protected]>
> Cc: Ilya Leoshkevich <[email protected]>
> Cc: Andrew Morton <[email protected]>
> Cc: Heiko Carstens <[email protected]>
> Cc: Vasily Gorbik <[email protected]>
> Cc: Christian Borntraeger <[email protected]>
> Cc: [email protected]
> ---
> lib/zlib_dfltcc/dfltcc_inflate.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> --- linux-next-20201120.orig/lib/zlib_dfltcc/dfltcc_inflate.c
> +++ linux-next-20201120/lib/zlib_dfltcc/dfltcc_inflate.c
> @@ -4,6 +4,7 @@
> #include "dfltcc_util.h"
> #include "dfltcc.h"
> #include <asm/setup.h>
> +#include <linux/export.h>
> #include <linux/zutil.h>
>
> /*
> @@ -29,6 +30,7 @@ int dfltcc_can_inflate(
> return is_bit_set(dfltcc_state->af.fns, DFLTCC_XPND) &&
> is_bit_set(dfltcc_state->af.fmts, DFLTCC_FMT0);
> }
> +EXPORT_SYMBOL(dfltcc_can_inflate);
>
> static int dfltcc_was_inflate_used(
> z_streamp strm
> @@ -147,3 +149,4 @@ dfltcc_inflate_action dfltcc_inflate(
> return (cc == DFLTCC_CC_OP1_TOO_SHORT || cc ==
> DFLTCC_CC_OP2_TOO_SHORT) ?
> DFLTCC_INFLATE_BREAK : DFLTCC_INFLATE_CONTINUE;
> }
> +EXPORT_SYMBOL(dfltcc_inflate);

Thanks for fixing this!

Acked-by: Ilya Leoshkevich <[email protected]>