arm64: Remove assertion on CONFIG_VMAP_STACK

CONFIG_VMAP_STACK is selected by arm64 arch unconditionly since commit
ef6861b8e6dd ("arm64: Mandate VMAP_STACK").

Remove the redundant assertion and headers.

Signed-off-by: Dawei Li <dawei.li@linux.dev>
Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/arm64/include/asm/vmap_stack.h b/arch/arm64/include/asm/vmap_stack.h
index 20873099c035c8bcaf6071e0344fde2f248a08d2..75daee1a07e97aca26fa01e6d602db340d6b441f 100644 (file)
--- a/arch/arm64/include/asm/vmap_stack.h
+++ b/arch/arm64/include/asm/vmap_stack.h
@@ -3,9 +3,7 @@
 #ifndef __ASM_VMAP_STACK_H
 #define __ASM_VMAP_STACK_H
 
-#include <linux/bug.h>
 #include <linux/gfp.h>
-#include <linux/kconfig.h>
 #include <linux/vmalloc.h>
 #include <linux/pgtable.h>
 #include <asm/memory.h>
@@ -19,8 +17,6 @@ static inline unsigned long *arch_alloc_vmap_stack(size_t stack_size, int node)
 {
        void *p;
 
-       BUILD_BUG_ON(!IS_ENABLED(CONFIG_VMAP_STACK));
-
        p = __vmalloc_node(stack_size, THREAD_ALIGN, THREADINFO_GFP, node,
                        __builtin_return_address(0));
        return kasan_reset_tag(p);

diff --git a/arch/arm64/kernel/sdei.c b/arch/arm64/kernel/sdei.c
index 95169f7b653198a438cf5ca27d473b54cfc87dce..213ac72ce4fda823bb4386d0e06936b62f3778ff 100644 (file)
--- a/arch/arm64/kernel/sdei.c
+++ b/arch/arm64/kernel/sdei.c
@@ -63,8 +63,6 @@ static void free_sdei_stacks(void)
 {
        int cpu;
 
-       BUILD_BUG_ON(!IS_ENABLED(CONFIG_VMAP_STACK));
-
        for_each_possible_cpu(cpu) {
                _free_sdei_stack(&sdei_stack_normal_ptr, cpu);
                _free_sdei_stack(&sdei_stack_critical_ptr, cpu);
@@ -88,8 +86,6 @@ static int init_sdei_stacks(void)
        int cpu;
        int err = 0;
 
-       BUILD_BUG_ON(!IS_ENABLED(CONFIG_VMAP_STACK));
-
        for_each_possible_cpu(cpu) {
                err = _init_sdei_stack(&sdei_stack_normal_ptr, cpu);
                if (err)