Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1411719 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-06-02 02:30 +0200 |
| Last post | 2016-06-02 20:20 +0200 |
| Articles | 5 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: build failure after merge of the pstore tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-06-02 02:30 +0200
Re: linux-next: build failure after merge of the pstore tree Kees Cook <keescook@chromium.org> - 2016-06-02 04:20 +0200
Re: linux-next: build failure after merge of the pstore tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-06-02 04:30 +0200
Re: linux-next: build failure after merge of the pstore tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-06-02 06:10 +0200
Re: linux-next: build failure after merge of the pstore tree Kees Cook <keescook@chromium.org> - 2016-06-02 20:20 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-06-02 02:30 +0200 |
| Subject | linux-next: build failure after merge of the pstore tree |
| Message-ID | <rFoGl-7g3-5@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Kees Cook <keescook@chromium.org> |
|---|---|
| Date | 2016-06-02 04:20 +0200 |
| Message-ID | <rFqoO-8qx-9@gated-at.bofh.it> |
| In reply to | #1411719 |
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
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-06-02 04:30 +0200 |
| Message-ID | <rFqyu-8tG-19@gated-at.bofh.it> |
| In reply to | #1411764 |
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
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-06-02 06:10 +0200 |
| Message-ID | <rFs7f-11O-1@gated-at.bofh.it> |
| In reply to | #1411719 |
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
[toc] | [prev] | [next] | [standalone]
| From | Kees Cook <keescook@chromium.org> |
|---|---|
| Date | 2016-06-02 20:20 +0200 |
| Message-ID | <rFFnP-13m-11@gated-at.bofh.it> |
| In reply to | #1411803 |
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web