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

Commit 39ad04cc authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King
Browse files

ARM: 8017/1: Move asm macro get_thread_info to asm/assembler.h 



asm/assembler.h is a better place for this macro since it is used by
asm files outside arch/arm/kernel/

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Tested-by: default avatarArun KS <getarunks@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a5d4506d

arch/arm/include/asm/assembler.h

+10 −0
Original line number Diff line number Diff line
@@ -174,6 +174,16 @@ 
	restore_irqs_notrace \oldcpsr

	.endm



/*

 * Get current thread_info.

 */

	.macro	get_thread_info, rd

 ARM(	mov	\rd, sp, lsr #13	)

 THUMB(	mov	\rd, sp			)

 THUMB(	lsr	\rd, \rd, #13		)

	mov	\rd, \rd, lsl #13

	.endm



#define USER(x...)				\

9999:	x;					\

	.pushsection __ex_table,"a";		\

arch/arm/kernel/entry-header.S

+0 −11
Original line number Diff line number Diff line
@@ -236,11 +236,6 @@ 
	movs	pc, lr				@ return & move spsr_svc into cpsr

	.endm



	.macro	get_thread_info, rd

	mov	\rd, sp, lsr #13

	mov	\rd, \rd, lsl #13

	.endm



	@

	@ 32-bit wide "mov pc, reg"

	@
@@ -306,12 +301,6 @@ 
	.endm

#endif	/* ifdef CONFIG_CPU_V7M / else */



	.macro	get_thread_info, rd

	mov	\rd, sp

	lsr	\rd, \rd, #13

	mov	\rd, \rd, lsl #13

	.endm



	@

	@ 32-bit wide "mov pc, reg"

	@

arch/arm/vfp/entry.S

+4 −1
Original line number Diff line number Diff line
@@ -8,9 +8,12 @@ 
 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/init.h>

#include <linux/linkage.h>

#include <asm/thread_info.h>

#include <asm/vfpmacros.h>

#include "../kernel/entry-header.S"

#include <asm/assembler.h>

#include <asm/asm-offsets.h>



@ VFP entry point.

@

arch/arm/vfp/vfphw.S

+4 −1
Original line number Diff line number Diff line
@@ -14,10 +14,13 @@ 
 * r10 points at the start of the private FP workspace in the thread structure

 * sp points to a struct pt_regs (as defined in include/asm/proc/ptrace.h)

 */

#include <linux/init.h>

#include <linux/linkage.h>

#include <asm/thread_info.h>

#include <asm/vfpmacros.h>

#include <linux/kern_levels.h>

#include "../kernel/entry-header.S"

#include <asm/assembler.h>

#include <asm/asm-offsets.h>



	.macro	DBGSTR, str

#ifdef DEBUG