Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1435024 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-07-01 07:30 +0200 |
| Last post | 2016-07-01 11:00 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: build failure after merge of the powerpc tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-01 07:30 +0200
Re: linux-next: build failure after merge of the powerpc tree Colin Ian King <colin.king@canonical.com> - 2016-07-01 11:00 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-07-01 07:30 +0200 |
| Subject | linux-next: build failure after merge of the powerpc tree |
| Message-ID | <rPZbz-2B8-5@gated-at.bofh.it> |
Hi all,
After merging the powerpc tree, today's linux-next build (powerpc
allyesconfig) failed like this:
arch/powerpc/kernel/fadump.c: In function 'fadump_invalidate_dump':
arch/powerpc/kernel/fadump.c:1014:2: error: expected ';' before '}' token
}
^
Caused by commit
4a03749f140c ("powerpc/fadump: Trivial fix of spelling mistake, clean up message")
I have added this fix patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 1 Jul 2016 15:19:34 +1000
Subject: [PATCH] powerpc/fadump: add missing semicolon
Fixes: 4a03749f140c ("powerpc/fadump: Trivial fix of spelling mistake, clean up message")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/kernel/fadump.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index f0664860753e..b3a663333d36 100644
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -1010,7 +1010,7 @@ static int fadump_invalidate_dump(struct fadump_mem_struct *fdm)
if (rc) {
pr_err("Failed to invalidate firmware-assisted dump registration. Unexpected error (%d).\n", rc);
- return rc
+ return rc;
}
fw_dump.dump_active = 0;
fdm_active = NULL;
--
2.8.1
--
Cheers,
Stephen Rothwell
[toc] | [next] | [standalone]
| From | Colin Ian King <colin.king@canonical.com> |
|---|---|
| Date | 2016-07-01 11:00 +0200 |
| Message-ID | <rQ2sN-4sz-3@gated-at.bofh.it> |
| In reply to | #1435024 |
On 01/07/16 06:27, Stephen Rothwell wrote:
> Hi all,
>
> After merging the powerpc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> arch/powerpc/kernel/fadump.c: In function 'fadump_invalidate_dump':
> arch/powerpc/kernel/fadump.c:1014:2: error: expected ';' before '}' token
> }
> ^
>
> Caused by commit
>
> 4a03749f140c ("powerpc/fadump: Trivial fix of spelling mistake, clean up message")
>
> I have added this fix patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 1 Jul 2016 15:19:34 +1000
> Subject: [PATCH] powerpc/fadump: add missing semicolon
>
> Fixes: 4a03749f140c ("powerpc/fadump: Trivial fix of spelling mistake, clean up message")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/powerpc/kernel/fadump.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
> index f0664860753e..b3a663333d36 100644
> --- a/arch/powerpc/kernel/fadump.c
> +++ b/arch/powerpc/kernel/fadump.c
> @@ -1010,7 +1010,7 @@ static int fadump_invalidate_dump(struct fadump_mem_struct *fdm)
>
> if (rc) {
> pr_err("Failed to invalidate firmware-assisted dump registration. Unexpected error (%d).\n", rc);
> - return rc
> + return rc;
> }
> fw_dump.dump_active = 0;
> fdm_active = NULL;
>
Apologies for that. Thanks for fixing it up.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web