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

Commit 07805ac8 authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Martin Schwidefsky
Browse files

[S390] ptrace: use common code for simple peek/poke operations 



arch_ptrace on s390 implements PTRACE_(PEEK|POKE)(TEXT|DATA) instead of
using using ptrace_request in kernel/ptrace.c.
The only reason is the 31bit addressing mode, where we have to unmask the
highest bit.

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent bdd42b28

arch/s390/kernel/ptrace.c

+4 −15
Original line number Diff line number Diff line
@@ -339,24 +339,10 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
	int copied, ret;



	switch (request) {

	case PTRACE_PEEKTEXT:

	case PTRACE_PEEKDATA:

		/* Remove high order bit from address (only for 31 bit). */

		addr &= PSW_ADDR_INSN;

		/* read word at location addr. */

		return generic_ptrace_peekdata(child, addr, data);



	case PTRACE_PEEKUSR:

		/* read the word at location addr in the USER area. */

		return peek_user(child, addr, data);



	case PTRACE_POKETEXT:

	case PTRACE_POKEDATA:

		/* Remove high order bit from address (only for 31 bit). */

		addr &= PSW_ADDR_INSN;

		/* write the word at location addr. */

		return generic_ptrace_pokedata(child, addr, data);



	case PTRACE_POKEUSR:

		/* write the word at location addr in the USER area */

		return poke_user(child, addr, data);
@@ -386,9 +372,12 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
			copied += sizeof(unsigned long);

		}

		return 0;

	}

	default:

		/* Removing high order bit from addr (only for 31 bit). */

		addr &= PSW_ADDR_INSN;

		return ptrace_request(child, request, addr, data);

	}

}



#ifdef CONFIG_COMPAT

/*