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

Commit ba6cadfe authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Martin Schwidefsky
Browse files

[S390] remove ieee_instruction_pointer from thread_struct 



The ieee_instruction_pointer can not be read from user space anymore
since git commit 613e1def, the ptrace
interface always returns zero. Remove it from the thread_struct. It
is still present in the user_regs_struct for compatability reasons.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent baa07158

arch/s390/include/asm/processor.h

+0 −2
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ struct thread_struct { 
        unsigned long prot_addr;        /* address of protection-excep.     */

        unsigned int trap_no;

        per_struct per_info;

	/* Used to give failing instruction back to user for ieee exceptions */

	unsigned long ieee_instruction_pointer; 

        /* pfault_wait is used to block the process on a pfault event */

	unsigned long pfault_wait;

};

arch/s390/include/asm/ptrace.h

+1 −2
Original line number Diff line number Diff line
@@ -481,8 +481,7 @@ struct user_regs_struct 
	 * watchpoints. This is the way intel does it.

	 */

	per_struct per_info;

	unsigned long ieee_instruction_pointer; 

	/* Used to give failing instruction back to user for ieee exceptions */

	unsigned long ieee_instruction_pointer;	/* obsolete, always 0 */

};



#ifdef __KERNEL__

arch/s390/kernel/compat_ptrace.h

+1 −2
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ struct user_regs_struct32 
	 * watchpoints. This is the way intel does it.

	 */

	per_struct32 per_info;

	u32  ieee_instruction_pointer; 

	/* Used to give failing instruction back to user for ieee exceptions */

	u32  ieee_instruction_pointer;	/* obsolete, always 0 */

};



struct user32 {

arch/s390/kernel/traps.c

+0 −1
Original line number Diff line number Diff line
@@ -447,7 +447,6 @@ static inline void do_fp_trap(struct pt_regs *regs, void __user *location, 
		else if (fpc & 0x0800) /* inexact */

			si.si_code = FPE_FLTRES;

	}

	current->thread.ieee_instruction_pointer = (addr_t) location;

	do_trap(pgm_int_code, SIGFPE,

		"floating point exception", regs, &si);

}