diff mbox series

[v3,1/2] arm64/arch_timer: include <linux/percpu.h>

Message ID 20240503171847.68267-1-puranjay@kernel.org (mailing list archive)
State Not Applicable
Headers show
Series [v3,1/2] arm64/arch_timer: include <linux/percpu.h> | expand

Checks

Context Check Description
netdev/tree_selection success Not a local patch

Commit Message

Puranjay Mohan May 3, 2024, 5:18 p.m. UTC
arch_timer.h includes linux/smp.h since the commit:

  6acc71ccac7187fc ("arm64: arch_timer: Allows a CPU-specific erratum to only affect a subset of CPUs")

It was included to use DEFINE_PER_CPU(), etc. But It should have
included <linux/percpu.h> rather than <linux/smp.h>. It worked because
smp.h includes percpu.h.

The next commit will remove percpu.h from smp.h and it will break this
usage.

Explicitly include percpu.h and remove smp.h

Signed-off-by: Puranjay Mohan <puranjay@kernel.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
---
 arch/arm64/include/asm/arch_timer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stephen Boyd May 8, 2024, 9:10 p.m. UTC | #1
Quoting Puranjay Mohan (2024-05-03 10:18:46)
> arch_timer.h includes linux/smp.h since the commit:
>
>   6acc71ccac7187fc ("arm64: arch_timer: Allows a CPU-specific erratum to only affect a subset of CPUs")
>
> It was included to use DEFINE_PER_CPU(), etc. But It should have
> included <linux/percpu.h> rather than <linux/smp.h>. It worked because
> smp.h includes percpu.h.
>
> The next commit will remove percpu.h from smp.h and it will break this
> usage.
>
> Explicitly include percpu.h and remove smp.h
>
> Signed-off-by: Puranjay Mohan <puranjay@kernel.org>
> Acked-by: Mark Rutland <mark.rutland@arm.com>
> ---

Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Catalin Marinas June 12, 2024, 4:08 p.m. UTC | #2
On Fri, 03 May 2024 17:18:46 +0000, Puranjay Mohan wrote:
> arch_timer.h includes linux/smp.h since the commit:
> 
>   6acc71ccac7187fc ("arm64: arch_timer: Allows a CPU-specific erratum to only affect a subset of CPUs")
> 
> It was included to use DEFINE_PER_CPU(), etc. But It should have
> included <linux/percpu.h> rather than <linux/smp.h>. It worked because
> smp.h includes percpu.h.
> 
> [...]

Applied to arm64 (for-next/misc), thanks!

[1/2] arm64/arch_timer: include <linux/percpu.h>
      https://git.kernel.org/arm64/c/7647e2b109f4
[2/2] arm64: implement raw_smp_processor_id() using thread_info
      https://git.kernel.org/arm64/c/bf0baa5bbdc9
diff mbox series

Patch

diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h
index 934c658ee947..f5794d50f51d 100644
--- a/arch/arm64/include/asm/arch_timer.h
+++ b/arch/arm64/include/asm/arch_timer.h
@@ -15,7 +15,7 @@ 
 #include <linux/bug.h>
 #include <linux/init.h>
 #include <linux/jump_label.h>
-#include <linux/smp.h>
+#include <linux/percpu.h>
 #include <linux/types.h>
 
 #include <clocksource/arm_arch_timer.h>