diff mbox series

[14/50] arm64: Fix circular header dependency

Message ID	20231216032651.3553101-4-kent.overstreet@linux.dev (mailing list archive)
State	New
Headers	show Return-Path: <owner-linux-mm@kvack.org> From: Kent Overstreet <kent.overstreet@linux.dev> To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: Kent Overstreet <kent.overstreet@linux.dev>, tglx@linutronix.de, x86@kernel.org, tj@kernel.org, peterz@infradead.org, mathieu.desnoyers@efficios.com, paulmck@kernel.org, keescook@chromium.org, dave.hansen@linux.intel.com, mingo@redhat.com, will@kernel.org, longman@redhat.com, boqun.feng@gmail.com, brauner@kernel.org, Suren Baghdasaryan <surenb@google.com> Subject: [PATCH 14/50] arm64: Fix circular header dependency Date: Fri, 15 Dec 2023 22:26:13 -0500 Message-ID: <20231216032651.3553101-4-kent.overstreet@linux.dev> In-Reply-To: <20231216032651.3553101-1-kent.overstreet@linux.dev> References: <20231216024834.3510073-1-kent.overstreet@linux.dev> <20231216032651.3553101-1-kent.overstreet@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	big header dependency cleanup targeting sched.h \| expand [00/50] big header dependency cleanup targeting sched.h [01/50] drivers/gpu/drm/i915/i915_memcpy.c: fix missing includes [02/50] x86/kernel/fpu/bugs.c: fix missing include [03/50] x86/lib/cache-smp.c: fix missing include [04/50] x86/include/asm/debugreg.h: fix missing include [05/50] x86/include/asm/paravirt_types.h: fix missing include [06/50] task_stack.h: add missing include [07/50] nsproxy.h: add missing include [08/50] kernel/fork.c: add missing include [09/50] kmsan: add missing types.h dependency [10/50] time_namespace.h: fix missing include [11/50] nodemask: Split out include/linux/nodemask_types.h [12/50] prandom: Remove unused include [13/50] timekeeping: Kill percpu.h dependency [14/50] arm64: Fix circular header dependency [15/50] kernel/numa.c: Move logging out of numa.h [16/50] sched.h: Move (spin\|rwlock)_needbreak() to spinlock.h [17/50] ktime.h: move ktime_t to types.h [18/50] hrtimers: Split out hrtimer_types.h [19/50] locking/mutex: split out mutex_types.h [20/50] posix-cpu-timers: Split out posix-timers_types.h [21/50] locking/seqlock: Split out seqlock_types.h [22/50] pid: Split out pid_types.h [23/50] sched.h: move pid helpers to pid.h [24/50] plist: Split out plist_types.h [25/50] wait: Remove uapi header file from main header file [26/50] rslib: kill bogus dependency on list.h [27/50] timerqueue: Split out timerqueue_types.h [28/50] signal: Kill bogus dependency on list.h [29/50] timers: Split out timer_types.h [30/50] workqueue: Split out workqueue_types.h [31/50] shm: Slim down dependencies [32/50] ipc: Kill bogus dependency on spinlock.h [33/50] Split out irqflags_types.h [34/50] mm_types_task.h: Trim dependencies [35/50] cpumask: Split out cpumask_types.h [36/50] syscall_user_dispatch.h: split out *_types.h [37/50] x86/signal: kill dependency on time.h [38/50] uapi/linux/resource.h: fix include [39/50] refcount: Split out refcount_types.h [40/50] seccomp: Split out seccomp_types.h [41/50] uidgid: Split out uidgid_types.h [42/50] sem: Split out sem_types.h [43/50] lockdep: move held_lock to lockdep_types.h [44/50] restart_block: Trim includes [45/50] rseq: Split out rseq.h from sched.h [46/50] preempt.h: Kill dependency on list.h [47/50] thread_info, uaccess.h: Move HARDENED_USERCOPY to better location [48/50] Kill unnecessary kernel.h include [49/50] kill unnecessary thread_info.h include [50/50] Kill sched.h dependency on rcupdate.h

Commit Message

Kent Overstreet Dec. 16, 2023, 3:26 a.m. UTC

Replace linux/percpu.h include with asm/percpu.h to avoid circular
dependency.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
---
 arch/arm64/include/asm/spectre.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/arch/arm64/include/asm/spectre.h b/arch/arm64/include/asm/spectre.h
index 06c357d83b13..0c4d9045c31f 100644
--- a/arch/arm64/include/asm/spectre.h
+++ b/arch/arm64/include/asm/spectre.h
@@ -13,8 +13,8 @@ 
 #define __BP_HARDEN_HYP_VECS_SZ	((BP_HARDEN_EL2_SLOTS - 1) * SZ_2K)
 
 #ifndef __ASSEMBLY__
-
-#include <linux/percpu.h>
+#include <linux/smp.h>
+#include <asm/percpu.h>
 
 #include <asm/cpufeature.h>
 #include <asm/virt.h>