diff options
| author | Will Deacon <will@kernel.org> | 2022-12-06 11:26:40 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-12-06 11:26:40 +0000 |
| commit | 595a121e8901c4f1c0a876cbd6322a0f418791e1 (patch) | |
| tree | 20268ac1c4f3cb5d30f6d7ea8e79dcb985c2eaa0 /arch/arm64/kernel/irq.c | |
| parent | 32b4824842762882352bf76da7624d97fc51f331 (diff) | |
| parent | 4585a934203d0ee1009bd31724190116aed01c10 (diff) | |
Merge branch 'for-next/stacks' into for-next/core
* for-next/stacks:
arm64: move on_thread_stack() to <asm/stacktrace.h>
arm64: remove current_top_of_stack()
Diffstat (limited to 'arch/arm64/kernel/irq.c')
| -rw-r--r-- | arch/arm64/kernel/irq.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm64/kernel/irq.c b/arch/arm64/kernel/irq.c index 9d8eaab742a4..6ad5c6ef5329 100644 --- a/arch/arm64/kernel/irq.c +++ b/arch/arm64/kernel/irq.c @@ -10,20 +10,21 @@ * Copyright (C) 2012 ARM Ltd. */ -#include <linux/irq.h> -#include <linux/memory.h> -#include <linux/smp.h> #include <linux/hardirq.h> #include <linux/init.h> +#include <linux/irq.h> #include <linux/irqchip.h> #include <linux/kprobes.h> +#include <linux/memory.h> #include <linux/scs.h> #include <linux/seq_file.h> +#include <linux/smp.h> #include <linux/vmalloc.h> #include <asm/daifflags.h> #include <asm/exception.h> -#include <asm/vmap_stack.h> #include <asm/softirq_stack.h> +#include <asm/stacktrace.h> +#include <asm/vmap_stack.h> /* Only access this in an NMI enter/exit */ DEFINE_PER_CPU(struct nmi_ctx, nmi_contexts); |