Skip to content

Commit 4002068

Browse files
Dawei Lictmarinas
authored andcommitted
arm64: Remove assertion on CONFIG_VMAP_STACK
CONFIG_VMAP_STACK is selected by arm64 arch unconditionly since commit ef6861b ("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>
1 parent 3a86608 commit 4002068

2 files changed

Lines changed: 0 additions & 8 deletions

File tree

arch/arm64/include/asm/vmap_stack.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
#ifndef __ASM_VMAP_STACK_H
44
#define __ASM_VMAP_STACK_H
55

6-
#include <linux/bug.h>
76
#include <linux/gfp.h>
8-
#include <linux/kconfig.h>
97
#include <linux/vmalloc.h>
108
#include <linux/pgtable.h>
119
#include <asm/memory.h>
@@ -19,8 +17,6 @@ static inline unsigned long *arch_alloc_vmap_stack(size_t stack_size, int node)
1917
{
2018
void *p;
2119

22-
BUILD_BUG_ON(!IS_ENABLED(CONFIG_VMAP_STACK));
23-
2420
p = __vmalloc_node(stack_size, THREAD_ALIGN, THREADINFO_GFP, node,
2521
__builtin_return_address(0));
2622
return kasan_reset_tag(p);

arch/arm64/kernel/sdei.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ static void free_sdei_stacks(void)
6363
{
6464
int cpu;
6565

66-
BUILD_BUG_ON(!IS_ENABLED(CONFIG_VMAP_STACK));
67-
6866
for_each_possible_cpu(cpu) {
6967
_free_sdei_stack(&sdei_stack_normal_ptr, cpu);
7068
_free_sdei_stack(&sdei_stack_critical_ptr, cpu);
@@ -88,8 +86,6 @@ static int init_sdei_stacks(void)
8886
int cpu;
8987
int err = 0;
9088

91-
BUILD_BUG_ON(!IS_ENABLED(CONFIG_VMAP_STACK));
92-
9389
for_each_possible_cpu(cpu) {
9490
err = _init_sdei_stack(&sdei_stack_normal_ptr, cpu);
9591
if (err)

0 commit comments

Comments
 (0)