Commit de0d22e5 authored by Nick Desaulniers's avatar Nick Desaulniers Committed by Linus Torvalds
Browse files

treewide: remove current_text_addr 

Prefer _THIS_IP_ defined in linux/kernel.h.

Most definitions of current_text_addr were the same as _THIS_IP_, but
a few archs had inline assembly instead.

This patch removes the final call site of current_text_addr, making all
of the definitions dead code.

[akpm@linux-foundation.org: fix arch/csky/include/asm/processor.h]
Link: http://lkml.kernel.org/r/20180911182413.180715-1-ndesaulniers@google.com


Signed-off-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 49ef341a

arch/alpha/include/asm/processor.h

+0 −6
Original line number Diff line number Diff line
@@ -10,12 +10,6 @@ 


#include <linux/personality.h>	/* for ADDR_LIMIT_32BIT */



/*

 * Returns current instruction pointer ("program counter").

 */

#define current_text_addr() \

  ({ void *__pc; __asm__ ("br %0,.+4" : "=r"(__pc)); __pc; })



/*

 * We have a 42-bit user address space: 4TB user VM...

 */

arch/arc/include/asm/processor.h

+0 −8
Original line number Diff line number Diff line
@@ -98,14 +98,6 @@ extern void start_thread(struct pt_regs * regs, unsigned long pc, 


extern unsigned int get_wchan(struct task_struct *p);



/*

 * Default implementation of macro that returns current

 * instruction pointer ("program counter").

 * Should the PC register be read instead ? This macro does not seem to

 * be used in many places so this wont be all that bad.

 */

#define current_text_addr() ({ __label__ _l; _l: &&_l; })



#endif /* !__ASSEMBLY__ */



/*

arch/arm/include/asm/processor.h

+0 −6
Original line number Diff line number Diff line
@@ -11,12 +11,6 @@ 
#ifndef __ASM_ARM_PROCESSOR_H

#define __ASM_ARM_PROCESSOR_H



/*

 * Default implementation of macro that returns current

 * instruction pointer ("program counter").

 */

#define current_text_addr() ({ __label__ _l; _l: &&_l;})



#ifdef __KERNEL__



#include <asm/hw_breakpoint.h>

arch/arm64/include/asm/processor.h

+0 −7
Original line number Diff line number Diff line
@@ -25,13 +25,6 @@ 
#define USER_DS		(TASK_SIZE_64 - 1)



#ifndef __ASSEMBLY__



/*

 * Default implementation of macro that returns current

 * instruction pointer ("program counter").

 */

#define current_text_addr() ({ __label__ _l; _l: &&_l;})



#ifdef __KERNEL__



#include <linux/build_bug.h>

arch/c6x/include/asm/processor.h

+0 −11
Original line number Diff line number Diff line
@@ -17,17 +17,6 @@ 
#include <asm/page.h>

#include <asm/current.h>



/*

 * Default implementation of macro that returns current

 * instruction pointer ("program counter").

 */

#define current_text_addr()			\

({						\

	void *__pc;				\

	asm("mvc .S2 pce1,%0\n" : "=b"(__pc));	\

	__pc;					\

})



/*

 * User space process size. This is mostly meaningless for NOMMU

 * but some C6X processors may have RAM addresses up to 0xFFFFFFFF.

CRA Git | Maintained and supported by SUSTech CRA and CCSE