[PATCH] powerpc/fadump: Fix build error with CONFIG_PRESERVE_FA_DUMP=y

Subsystems: linux for powerpc (32-bit and 64-bit), the rest

STALE2232d LANDED

Landed in mainline as 5f987caec521 on 2020-07-27.

3 messages, 3 authors, 2020-07-30 · open the first message on its own page

[PATCH] powerpc/fadump: Fix build error with CONFIG_PRESERVE_FA_DUMP=y

From: Michael Ellerman <mpe@ellerman.id.au>
Date: 2020-07-27 07:05:33

skiroot_defconfig fails:

arch/powerpc/kernel/fadump.c:48:17: error: ‘cpus_in_fadump’ defined but not used
   48 | static atomic_t cpus_in_fadump;

Fix it by moving the definition into the #ifdef where it's used.

Fixes: ba608c4fa12c ("powerpc/fadump: fix race between pstore write and fadump crash trigger")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
 arch/powerpc/kernel/fadump.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index 1858896d6809..10ebb4bf71ad 100644
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c

@@ -45,10 +45,12 @@ static struct fw_dump fw_dump;
 static void __init fadump_reserve_crash_area(u64 base);
 
 struct kobject *fadump_kobj;
-static atomic_t cpus_in_fadump;
 
 #ifndef CONFIG_PRESERVE_FA_DUMP
+
+static atomic_t cpus_in_fadump;
 static DEFINE_MUTEX(fadump_mutex);
+
 struct fadump_mrange_info crash_mrange_info = { "crash", NULL, 0, 0, 0, false };
 
 #define RESERVED_RNGS_SZ	16384 /* 16K - 128 entries */

-- 
2.25.1

Re: [PATCH] powerpc/fadump: Fix build error with CONFIG_PRESERVE_FA_DUMP=y

From: Gustavo Romero <hidden>
Date: 2020-07-29 15:10:51

On 7/27/20 4:03 AM, Michael Ellerman wrote:

quoted hunk

skiroot_defconfig fails:

arch/powerpc/kernel/fadump.c:48:17: error: ‘cpus_in_fadump’ defined but not used
    48 | static atomic_t cpus_in_fadump;

Fix it by moving the definition into the #ifdef where it's used.

Fixes: ba608c4fa12c ("powerpc/fadump: fix race between pstore write and fadump crash trigger")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
  arch/powerpc/kernel/fadump.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index 1858896d6809..10ebb4bf71ad 100644
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c

@@ -45,10 +45,12 @@ static struct fw_dump fw_dump;
  static void __init fadump_reserve_crash_area(u64 base);

  struct kobject *fadump_kobj;
-static atomic_t cpus_in_fadump;

  #ifndef CONFIG_PRESERVE_FA_DUMP
+
+static atomic_t cpus_in_fadump;
  static DEFINE_MUTEX(fadump_mutex);
+
  struct fadump_mrange_info crash_mrange_info = { "crash", NULL, 0, 0, 0, false };

  #define RESERVED_RNGS_SZ	16384 /* 16K - 128 entries */

Tested-by: Gustavo Romero <redacted>


Thanks,
Gustavo

Re: [PATCH] powerpc/fadump: Fix build error with CONFIG_PRESERVE_FA_DUMP=y

From: Michael Ellerman <hidden>
Date: 2020-07-30 13:38:57

On Mon, 27 Jul 2020 17:03:41 +1000, Michael Ellerman wrote:

skiroot_defconfig fails:

arch/powerpc/kernel/fadump.c:48:17: error: ���cpus_in_fadump��� defined but not used
   48 | static atomic_t cpus_in_fadump;

Fix it by moving the definition into the #ifdef where it's used.

Applied to powerpc/next.

[1/1] powerpc/fadump: Fix build error with CONFIG_PRESERVE_FA_DUMP=y
      https://git.kernel.org/powerpc/c/5f987caec521cbb00d4ba2dc641ac8074626b762

cheers

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help