Skip to contentSkip to conversation

powerpc/32: Include thread_info.h in head_booke.h

PATCH Applied Nathan Chancellor 4 participants 4 messages Apr 6, 2023 – Apr 26, 2023 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/32: Include thread_info.h in head_booke.h

When building with W=1 after commit 80b6093b55e3 ("kbuild: add -Wundef to KBUILD_CPPFLAGS for W=1 builds"), the following warning occurs.

In file included from arch/powerpc/kvm/bookehv_interrupts.S:26:
arch/powerpc/kvm/../kernel/head_booke.h:20:6: warning: "THREAD_SHIFT" is not defined, evaluates to 0 [-Wundef]

     20 | #if (THREAD_SHIFT < 15)
        |      ^~~~~~~~~~~~

THREAD_SHIFT is defined in thread_info.h but it is not directly included in head_booke.h, so it is possible for THREAD_SHIFT to be undefined. Add the include to ensure that THREAD_SHIFT is always defined.

---
 arch/powerpc/kernel/head_booke.h | 1 +
 1 file changed, 1 insertion(+)
arch/powerpc/kernel/head_booke.h +1 -0
index 37d43c172676..b6b5b01a173c 100644
@@ -5,6 +5,7 @@
 #include <asm/ptrace.h>	/* for STACK_FRAME_REGS_MARKER */
 #include <asm/kvm_asm.h>
 #include <asm/kvm_booke_hv_asm.h>
+#include <asm/thread_info.h>	/* for THREAD_SHIFT */
 
 #ifdef __ASSEMBLY__
 

---
base-commit: b0bbe5a2915201e3231e788d716d39dc54493b03
change-id: 20230406-wundef-thread_shift_booke-e08d806ed656

Best regards,

Signature · 1 line
Nathan Chancellor <[email protected]>
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Nathan Chancellor

When building with W=1 after commit 80b6093b55e3 ("kbuild: add -Wundef to KBUILD_CPPFLAGS for W=1 builds"), the following warning occurs.

In file included from arch/powerpc/kvm/bookehv_interrupts.S:26:
arch/powerpc/kvm/../kernel/head_booke.h:20:6: warning: "THREAD_SHIFT" is not defined, evaluates to 0 [-Wundef]

     20 | #if (THREAD_SHIFT < 15)
        |      ^~~~~~~~~~~~
Quoted 7 lines

THREAD_SHIFT is defined in thread_info.h but it is not directly included in head_booke.h, so it is possible for THREAD_SHIFT to be undefined. Add the include to ensure that THREAD_SHIFT is always defined.

Thanks for the patch!

Quoted 26 lines
---
 arch/powerpc/kernel/head_booke.h | 1 +
 1 file changed, 1 insertion(+)
arch/powerpc/kernel/head_booke.h +1 -1
index 37d43c172676..b6b5b01a173c 100644
@@ -5,6 +5,7 @@
 #include <asm/ptrace.h>	/* for STACK_FRAME_REGS_MARKER */
 #include <asm/kvm_asm.h>
 #include <asm/kvm_booke_hv_asm.h>
+#include <asm/thread_info.h>	/* for THREAD_SHIFT */
 
 #ifdef __ASSEMBLY__
 
 
---

base-commit: b0bbe5a2915201e3231e788d716d39dc54493b03
change-id: 20230406-wundef-thread_shift_booke-e08d806ed656

Best regards,

Signature · 1 line
Nathan Chancellor <[email protected]>
Reviewed-by on v1 1/1
#2 lore raw
In reply to Nathan Chancellor
Quoted 9 lines · Nathan Chancellor

When building with W=1 after commit 80b6093b55e3 ("kbuild: add -Wundef to KBUILD_CPPFLAGS for W=1 builds"), the following warning occurs.

In file included from arch/powerpc/kvm/bookehv_interrupts.S:26:
arch/powerpc/kvm/../kernel/head_booke.h:20:6: warning: "THREAD_SHIFT" is not defined, evaluates to 0 [-Wundef]

     20 | #if (THREAD_SHIFT < 15)
        |      ^~~~~~~~~~~~
Quoted 8 lines

THREAD_SHIFT is defined in thread_info.h but it is not directly included in head_booke.h, so it is possible for THREAD_SHIFT to be undefined. Add the include to ensure that THREAD_SHIFT is always defined.

---

Thanks.

Quoted 24 lines
 arch/powerpc/kernel/head_booke.h | 1 +
 1 file changed, 1 insertion(+)
arch/powerpc/kernel/head_booke.h +1 -1
index 37d43c172676..b6b5b01a173c 100644
@@ -5,6 +5,7 @@
 #include <asm/ptrace.h>        /* for STACK_FRAME_REGS_MARKER */
 #include <asm/kvm_asm.h>
 #include <asm/kvm_booke_hv_asm.h>
+#include <asm/thread_info.h>   /* for THREAD_SHIFT */
 
 #ifdef __ASSEMBLY__
 
 
---

base-commit: b0bbe5a2915201e3231e788d716d39dc54493b03
change-id: 20230406-wundef-thread_shift_booke-e08d806ed656

Best regards,
--
Nathan Chancellor <[email protected]>

Signature · 2 lines
Best Regards
Masahiro Yamada
#3 lore raw
In reply to Nathan Chancellor
Quoted 9 lines · Nathan Chancellor

When building with W=1 after commit 80b6093b55e3 ("kbuild: add -Wundef to KBUILD_CPPFLAGS for W=1 builds"), the following warning occurs.

In file included from arch/powerpc/kvm/bookehv_interrupts.S:26:
arch/powerpc/kvm/../kernel/head_booke.h:20:6: warning: "THREAD_SHIFT" is not defined, evaluates to 0 [-Wundef]

     20 | #if (THREAD_SHIFT < 15)
        |      ^~~~~~~~~~~~

[...]

Applied to powerpc/next.

[1/1] powerpc/32: Include thread_info.h in head_booke.h

      https://git.kernel.org/powerpc/c/8002725b9e3369ce8616d32dc2e7a57870475142

cheers