* linux-next: build failure after merge of the pstore tree
@ 2016-06-02 0:25 Stephen Rothwell
2016-06-02 2:15 ` Kees Cook
2016-06-02 4:03 ` Stephen Rothwell
0 siblings, 2 replies; 7+ messages in thread
From: Stephen Rothwell @ 2016-06-02 0:25 UTC (permalink / raw)
To: Kees Cook; +Cc: linux-next, linux-kernel, Geliang Tang
Hi Kees,
After merging the pstore tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/acpi/apei/erst.c:943:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.read = erst_reader,
^
Caused by commit
d8aaf3511a13 ("pstore: add lzo/lz4 compression support")
I added this patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 2 Jun 2016 10:20:27 +1000
Subject: [PATCH] pstore: update acpi/apei/erst.c for struct pstore_info change
Fixes: d8aaf3511a13 ("pstore: add lzo/lz4 compression support")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/acpi/apei/erst.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index 006c3894c6ea..3024edf43a92 100644
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -927,7 +927,8 @@ static int erst_open_pstore(struct pstore_info *psi);
static int erst_close_pstore(struct pstore_info *psi);
static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, int *count,
struct timespec *time, char **buf,
- bool *compressed, struct pstore_info *psi);
+ bool *compressed, ssize_t *ecc_notice_size,
+ struct pstore_info *psi);
static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason,
u64 *id, unsigned int part, int count, bool compressed,
size_t size, struct pstore_info *psi);
@@ -987,7 +988,8 @@ static int erst_close_pstore(struct pstore_info *psi)
static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, int *count,
struct timespec *time, char **buf,
- bool *compressed, struct pstore_info *psi)
+ bool *compressed, ssize_t *ecc_notice_size,
+ struct pstore_info *psi)
{
int rc;
ssize_t len = 0;
--
2.8.1
--
Cheers,
Stephen Rothwell
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: linux-next: build failure after merge of the pstore tree
2016-06-02 0:25 linux-next: build failure after merge of the pstore tree Stephen Rothwell
@ 2016-06-02 2:15 ` Kees Cook
2016-06-02 2:29 ` Stephen Rothwell
2016-06-02 4:03 ` Stephen Rothwell
1 sibling, 1 reply; 7+ messages in thread
From: Kees Cook @ 2016-06-02 2:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux-Next, LKML, Geliang Tang
Thanks for the patch! Should I add this to my tree?
-Kees
On Wed, Jun 1, 2016 at 5:25 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Kees,
>
> After merging the pstore tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/acpi/apei/erst.c:943:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> .read = erst_reader,
> ^
>
> Caused by commit
>
> d8aaf3511a13 ("pstore: add lzo/lz4 compression support")
>
> I added this patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 2 Jun 2016 10:20:27 +1000
> Subject: [PATCH] pstore: update acpi/apei/erst.c for struct pstore_info change
>
> Fixes: d8aaf3511a13 ("pstore: add lzo/lz4 compression support")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/acpi/apei/erst.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
> index 006c3894c6ea..3024edf43a92 100644
> --- a/drivers/acpi/apei/erst.c
> +++ b/drivers/acpi/apei/erst.c
> @@ -927,7 +927,8 @@ static int erst_open_pstore(struct pstore_info *psi);
> static int erst_close_pstore(struct pstore_info *psi);
> static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, int *count,
> struct timespec *time, char **buf,
> - bool *compressed, struct pstore_info *psi);
> + bool *compressed, ssize_t *ecc_notice_size,
> + struct pstore_info *psi);
> static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason,
> u64 *id, unsigned int part, int count, bool compressed,
> size_t size, struct pstore_info *psi);
> @@ -987,7 +988,8 @@ static int erst_close_pstore(struct pstore_info *psi)
>
> static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, int *count,
> struct timespec *time, char **buf,
> - bool *compressed, struct pstore_info *psi)
> + bool *compressed, ssize_t *ecc_notice_size,
> + struct pstore_info *psi)
> {
> int rc;
> ssize_t len = 0;
> --
> 2.8.1
>
> --
> Cheers,
> Stephen Rothwell
--
Kees Cook
Chrome OS & Brillo Security
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: build failure after merge of the pstore tree
2016-06-02 2:15 ` Kees Cook
@ 2016-06-02 2:29 ` Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2016-06-02 2:29 UTC (permalink / raw)
To: Kees Cook; +Cc: Linux-Next, LKML, Geliang Tang
Hi Kees,
On Wed, 1 Jun 2016 19:15:11 -0700 Kees Cook <keescook@chromium.org> wrote:
>
> Thanks for the patch! Should I add this to my tree?
Yes, since your tree is broken without it. This patch should have been
part of the patch it fixes. An x86_64 allmodconfig build of just your
tree should fail at the moment.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: build failure after merge of the pstore tree
2016-06-02 0:25 linux-next: build failure after merge of the pstore tree Stephen Rothwell
2016-06-02 2:15 ` Kees Cook
@ 2016-06-02 4:03 ` Stephen Rothwell
2016-06-02 18:14 ` Kees Cook
1 sibling, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2016-06-02 4:03 UTC (permalink / raw)
To: Kees Cook; +Cc: linux-next, linux-kernel, Geliang Tang
Hi Kees,
On Thu, 2 Jun 2016 10:25:56 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the pstore tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/acpi/apei/erst.c:943:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> .read = erst_reader,
> ^
This also affected arch/powerpc/kernel/nvram_64.c:
arch/powerpc/kernel/nvram_64.c:563:10: error: initialization
from incompatible pointer type [-Werror=incompatible-pointer-types]
.read = nvram_pstore_read,
^
So I added this patch as well:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 2 Jun 2016 13:58:25 +1000
Subject: [PATCH] pstore: update arch/powerpc/kernel/nvram_64.c for struct pstore_info change
Fixes: d8aaf3511a13 ("pstore: add lzo/lz4 compression support")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/kernel/nvram_64.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index 856f9a7944cd..5ad2579e2cdc 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -444,7 +444,8 @@ static int nvram_pstore_write(enum pstore_type_id type,
*/
static ssize_t nvram_pstore_read(u64 *id, enum pstore_type_id *type,
int *count, struct timespec *time, char **buf,
- bool *compressed, struct pstore_info *psi)
+ bool *compressed, ssize_t *ecc_notice_size,
+ struct pstore_info *psi)
{
struct oops_log_info *oops_hdr;
unsigned int err_type, id_no, size = 0;
--
2.8.1
I guess I don't really know if there is further fixes necessary, these
patches just fix up the build.
--
Cheers,
Stephen Rothwell
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: linux-next: build failure after merge of the pstore tree
2016-06-02 4:03 ` Stephen Rothwell
@ 2016-06-02 18:14 ` Kees Cook
0 siblings, 0 replies; 7+ messages in thread
From: Kees Cook @ 2016-06-02 18:14 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux-Next, LKML, Geliang Tang
Thanks! All callers should be fixed now.
-Kees
On Wed, Jun 1, 2016 at 9:03 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Kees,
>
> On Thu, 2 Jun 2016 10:25:56 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the pstore tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/acpi/apei/erst.c:943:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>> .read = erst_reader,
>> ^
>
> This also affected arch/powerpc/kernel/nvram_64.c:
>
> arch/powerpc/kernel/nvram_64.c:563:10: error: initialization
> from incompatible pointer type [-Werror=incompatible-pointer-types]
> .read = nvram_pstore_read,
> ^
>
> So I added this patch as well:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 2 Jun 2016 13:58:25 +1000
> Subject: [PATCH] pstore: update arch/powerpc/kernel/nvram_64.c for struct pstore_info change
>
> Fixes: d8aaf3511a13 ("pstore: add lzo/lz4 compression support")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/powerpc/kernel/nvram_64.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
> index 856f9a7944cd..5ad2579e2cdc 100644
> --- a/arch/powerpc/kernel/nvram_64.c
> +++ b/arch/powerpc/kernel/nvram_64.c
> @@ -444,7 +444,8 @@ static int nvram_pstore_write(enum pstore_type_id type,
> */
> static ssize_t nvram_pstore_read(u64 *id, enum pstore_type_id *type,
> int *count, struct timespec *time, char **buf,
> - bool *compressed, struct pstore_info *psi)
> + bool *compressed, ssize_t *ecc_notice_size,
> + struct pstore_info *psi)
> {
> struct oops_log_info *oops_hdr;
> unsigned int err_type, id_no, size = 0;
> --
> 2.8.1
>
> I guess I don't really know if there is further fixes necessary, these
> patches just fix up the build.
> --
> Cheers,
> Stephen Rothwell
--
Kees Cook
Chrome OS & Brillo Security
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: build failure after merge of the pstore tree
@ 2018-08-03 1:00 Stephen Rothwell
2018-08-03 2:56 ` Kees Cook
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2018-08-03 1:00 UTC (permalink / raw)
To: Kees Cook
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Geliang Tang
[-- Attachment #1: Type: text/plain, Size: 409 bytes --]
Hi Kees,
After merging the pstore tree, today's linux-next build (x86_64
allmodconfig) failed like this:
fs/pstore/platform.o: In function `zbufsize_zstd':
platform.c:(.text+0x172): undefined reference to `ZSTD_compressBound'
Caused by commit
48ed452ca6ad ("pstore: add zstd compression support")
I have used the pstore tree from next-20180802 for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: linux-next: build failure after merge of the pstore tree
2018-08-03 1:00 Stephen Rothwell
@ 2018-08-03 2:56 ` Kees Cook
0 siblings, 0 replies; 7+ messages in thread
From: Kees Cook @ 2018-08-03 2:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Geliang Tang
On Thu, Aug 2, 2018 at 6:00 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Kees,
>
> After merging the pstore tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> fs/pstore/platform.o: In function `zbufsize_zstd':
> platform.c:(.text+0x172): undefined reference to `ZSTD_compressBound'
>
> Caused by commit
>
> 48ed452ca6ad ("pstore: add zstd compression support")
Yikes. I have no idea how this slipped through. allmodconfig builds
are my standard sanity-check but I clearly made some kind of error in
my scripting.
I'll get it fixed. Thanks!
-Kees
--
Kees Cook
Pixel Security
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-08-03 2:56 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-02 0:25 linux-next: build failure after merge of the pstore tree Stephen Rothwell
2016-06-02 2:15 ` Kees Cook
2016-06-02 2:29 ` Stephen Rothwell
2016-06-02 4:03 ` Stephen Rothwell
2016-06-02 18:14 ` Kees Cook
-- strict thread matches above, loose matches on Subject: below --
2018-08-03 1:00 Stephen Rothwell
2018-08-03 2:56 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox