Commit 595a121e authored by Will Deacon's avatar Will Deacon
Browse files

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()
parents 32b48248 4585a934

arch/arm64/include/asm/processor.h

+0 −13
Original line number Diff line number Diff line
@@ -396,18 +396,5 @@ long get_tagged_addr_ctrl(struct task_struct *task); 
#define GET_TAGGED_ADDR_CTRL()		get_tagged_addr_ctrl(current)

#endif



/*

 * For CONFIG_GCC_PLUGIN_STACKLEAK

 *

 * These need to be macros because otherwise we get stuck in a nightmare

 * of header definitions for the use of task_stack_page.

 */



/*

 * The top of the current task's task stack

 */

#define current_top_of_stack()	((unsigned long)current->stack + THREAD_SIZE)

#define on_thread_stack()	(on_task_stack(current, current_stack_pointer, 1))



#endif /* __ASSEMBLY__ */

#endif /* __ASM_PROCESSOR_H */

arch/arm64/include/asm/stacktrace.h

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ static inline bool on_task_stack(const struct task_struct *tsk, 
	return stackinfo_on_stack(&info, sp, size);

}



#define on_thread_stack()	(on_task_stack(current, current_stack_pointer, 1))



#ifdef CONFIG_VMAP_STACK

DECLARE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)], overflow_stack);

arch/arm64/kernel/irq.c

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