Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 725d3aa5 authored by Mark Rutland's avatar Mark Rutland Committed by Zubin Mithra
Browse files

UPSTREAM: arm64: factor out current_stack_pointer 



We define current_stack_pointer in <asm/thread_info.h>, though other
files and header relying upon it do not have this necessary include, and
are thus fragile to changes in the header soup.

Subsequent patches will affect the header soup such that directly
including <asm/thread_info.h> may result in a circular header include in
some of these cases, so we can't simply include <asm/thread_info.h>.

Instead, factor current_thread_info into its own header, and have all
existing users include this explicitly.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Tested-by: default avatarLaura Abbott <labbott@redhat.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>

Bug: 38331309
Change-Id: I4d6bc27bef686d0dade1d6abe1ce947cf6c4dfb3
(cherry picked from commit a9ea0017ebe8889dfa136cac2aa7ae0ee6915e1f)
Signed-off-by: default avatarZubin Mithra <zsm@google.com>
parent d6d869da

arch/arm64/include/asm/percpu.h

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#ifndef __ASM_PERCPU_H

#define __ASM_PERCPU_H



#include <asm/stack_pointer.h>



static inline void set_my_cpu_offset(unsigned long off)

{

	asm volatile("msr tpidr_el1, %0" :: "r" (off) : "memory");

arch/arm64/include/asm/perf_event.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef __ASM_PERF_EVENT_H

#define __ASM_PERF_EVENT_H



#include <asm/stack_pointer.h>



#ifdef CONFIG_PERF_EVENTS

struct pt_regs;

extern unsigned long perf_instruction_pointer(struct pt_regs *regs);

arch/arm64/include/asm/stack_pointer.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#ifndef __ASM_STACK_POINTER_H

#define __ASM_STACK_POINTER_H



/*

 * how to get the current stack pointer from C

 */

register unsigned long current_stack_pointer asm ("sp");



#endif /* __ASM_STACK_POINTER_H */

arch/arm64/include/asm/thread_info.h

+1 −5
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 


struct task_struct;



#include <asm/stack_pointer.h>

#include <asm/types.h>



typedef unsigned long mm_segment_t;
@@ -64,11 +65,6 @@ struct thread_info { 


#define init_stack		(init_thread_union.stack)



/*

 * how to get the current stack pointer from C

 */

register unsigned long current_stack_pointer asm ("sp");



/*

 * how to get the thread information struct from C

 */

arch/arm64/kernel/return_address.c

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/export.h>

#include <linux/ftrace.h>



#include <asm/stack_pointer.h>

#include <asm/stacktrace.h>



struct return_address_data {