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

Commit 9cb1ccec authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390: remove all usages of PSW_ADDR_INSN 



Yet another leftover from the 31 bit era. The usual operation
"y = x & PSW_ADDR_INSN" with the PSW_ADDR_INSN mask is a nop for
CONFIG_64BIT.

Therefore remove all usages and hope the code is a bit less confusing.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
parent fecc868a

arch/s390/include/asm/ptrace.h

+2 −2
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static inline int test_pt_regs_flag(struct pt_regs *regs, int flag) 
#define arch_has_block_step()	(1)



#define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)

#define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN)

#define instruction_pointer(regs) ((regs)->psw.addr)

#define user_stack_pointer(regs)((regs)->gprs[15])

#define profile_pc(regs) instruction_pointer(regs)
@@ -171,7 +171,7 @@ unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n); 


static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)

{

	return regs->gprs[15] & PSW_ADDR_INSN;

	return regs->gprs[15];

}



#endif /* __ASSEMBLY__ */

arch/s390/kernel/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -1470,7 +1470,7 @@ debug_dflt_header_fn(debug_info_t * id, struct debug_view *view, 
		except_str = "*";

	else

		except_str = "-";

	caller = ((unsigned long) entry->caller) & PSW_ADDR_INSN;

	caller = (unsigned long) entry->caller;

	rc += sprintf(out_buf, "%02i %011lld:%06lu %1u %1s %02i %p  ",

		      area, (long long)time_spec.tv_sec,

		      time_spec.tv_nsec / 1000, level, except_str,

arch/s390/kernel/dumpstack.c

+4 −5
Original line number Diff line number Diff line
@@ -34,22 +34,21 @@ __show_trace(unsigned long sp, unsigned long low, unsigned long high) 
	unsigned long addr;



	while (1) {

		sp = sp & PSW_ADDR_INSN;

		if (sp < low || sp > high - sizeof(*sf))

			return sp;

		sf = (struct stack_frame *) sp;

		addr = sf->gprs[8] & PSW_ADDR_INSN;

		addr = sf->gprs[8];

		printk("([<%016lx>] %pSR)\n", addr, (void *)addr);

		/* Follow the backchain. */

		while (1) {

			low = sp;

			sp = sf->back_chain & PSW_ADDR_INSN;

			sp = sf->back_chain;

			if (!sp)

				break;

			if (sp <= low || sp > high - sizeof(*sf))

				return sp;

			sf = (struct stack_frame *) sp;

			addr = sf->gprs[8] & PSW_ADDR_INSN;

			addr = sf->gprs[8];

			printk(" [<%016lx>] %pSR\n", addr, (void *)addr);

		}

		/* Zero backchain detected, check for interrupt frame. */
@@ -57,7 +56,7 @@ __show_trace(unsigned long sp, unsigned long low, unsigned long high) 
		if (sp <= low || sp > high - sizeof(*regs))

			return sp;

		regs = (struct pt_regs *) sp;

		addr = regs->psw.addr & PSW_ADDR_INSN;

		addr = regs->psw.addr;

		printk(" [<%016lx>] %pSR\n", addr, (void *)addr);

		low = sp;

		sp = regs->gprs[15];

arch/s390/kernel/early.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static void early_pgm_check_handler(void) 
	unsigned long addr;



	addr = S390_lowcore.program_old_psw.addr;

	fixup = search_exception_tables(addr & PSW_ADDR_INSN);

	fixup = search_exception_tables(addr);

	if (!fixup)

		disabled_wait(0);

	/* Disable low address protection before storing into lowcore. */

arch/s390/kernel/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ unsigned long prepare_ftrace_return(unsigned long parent, unsigned long ip) 
		goto out;

	if (unlikely(atomic_read(&current->tracing_graph_pause)))

		goto out;

	ip = (ip & PSW_ADDR_INSN) - MCOUNT_INSN_SIZE;

	ip -= MCOUNT_INSN_SIZE;

	trace.func = ip;

	trace.depth = current->curr_ret_stack + 1;

	/* Only trace if the calling function expects to. */