Commit 40020685 authored by Dawei Li's avatar Dawei Li Committed by Catalin Marinas
Browse files

arm64: Remove assertion on CONFIG_VMAP_STACK 



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

Remove the redundant assertion and headers.

Signed-off-by: default avatarDawei Li <dawei.li@linux.dev>
Acked-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 3a866087

arch/arm64/include/asm/vmap_stack.h

+0 −4
Original line number Diff line number Diff line
@@ -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);

arch/arm64/kernel/sdei.c

+0 −4
Original line number Diff line number Diff line
@@ -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)