Commit adf9904d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: parport_mfc3 - Not makes it a bool before the comparison.
  m68k: don't export static inline functions
  fbdev: atafb - add palette register check
  m68k: Remove the BKL from sys_execve
  m68k: Cleanup linker scripts using new linker script macros.
  m68k: Make thread_info.h usable from assembly.
  m68knommu: define arch_has_single_step() and friends
  m68k: ptrace fixes
  m68k: use generic code for ptrace requests
  rtc: Add an RTC driver for the Ricoh RP5C01
  rtc: Add an RTC driver for the Oki MSM6242
parents bb592cf4 49966bae

arch/m68k/include/asm/ptrace.h

+17 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ struct switch_stack { 
#define PTRACE_GETFPREGS          14

#define PTRACE_SETFPREGS          15



#define PTRACE_SINGLEBLOCK	33	/* resume execution until next branch */



#ifdef __KERNEL__



#ifndef PS_S
@@ -82,6 +84,21 @@ struct switch_stack { 
#define instruction_pointer(regs) ((regs)->pc)

#define profile_pc(regs) instruction_pointer(regs)

extern void show_regs(struct pt_regs *);



/*

 * These are defined as per linux/ptrace.h, which see.

 */

struct task_struct;



#define arch_has_single_step()	(1)

extern void user_enable_single_step(struct task_struct *);

extern void user_disable_single_step(struct task_struct *);



#ifdef CONFIG_MMU

#define arch_has_block_step()	(1)

extern void user_enable_block_step(struct task_struct *);

#endif



#endif /* __KERNEL__ */

#endif /* __ASSEMBLY__ */

#endif /* _M68K_PTRACE_H */

arch/m68k/include/asm/thread_info_mm.h

+4 −1
Original line number Diff line number Diff line
@@ -4,10 +4,12 @@ 
#ifndef ASM_OFFSETS_C

#include <asm/asm-offsets.h>

#endif

#include <asm/current.h>

#include <asm/types.h>

#include <asm/page.h>



#ifndef __ASSEMBLY__

#include <asm/current.h>



struct thread_info {

	struct task_struct	*task;		/* main task structure */

	unsigned long		flags;
@@ -16,6 +18,7 @@ struct thread_info { 
	__u32 cpu; /* should always be 0 on m68k */

	struct restart_block    restart_block;

};

#endif /* __ASSEMBLY__ */



#define PREEMPT_ACTIVE		0x4000000

arch/m68k/kernel/entry.S

+5 −1
Original line number Diff line number Diff line
@@ -179,7 +179,11 @@ do_signal_return: 
	addql	#8,%sp

	RESTORE_SWITCH_STACK

	addql	#4,%sp

	jbra	resume_userspace

	tstl	%d0

	jeq	resume_userspace

	| when single stepping into handler stop at the first insn

	btst	#6,%curptr@(TASK_INFO+TINFO_FLAGS+2)

	jeq	resume_userspace



do_delayed_trace:

	bclr	#7,%sp@(PT_OFF_SR)	| clear trace bit in SR

arch/m68k/kernel/process.c

+1 −4
Original line number Diff line number Diff line
@@ -317,15 +317,12 @@ asmlinkage int sys_execve(char __user *name, char __user * __user *argv, char __ 
	char * filename;

	struct pt_regs *regs = (struct pt_regs *) &name;



	lock_kernel();

	filename = getname(name);

	error = PTR_ERR(filename);

	if (IS_ERR(filename))

		goto out;

		return error;

	error = do_execve(filename, argv, envp, regs);

	putname(filename);

out:

	unlock_kernel();

	return error;

}

arch/m68k/kernel/ptrace.c

+46 −66
Original line number Diff line number Diff line
@@ -35,7 +35,9 @@ 
#define SR_MASK 0x001f



/* sets the trace bits. */

#define TRACE_BITS 0x8000

#define TRACE_BITS 0xC000

#define T1_BIT 0x8000

#define T0_BIT 0x4000



/* Find the stack offset for a register, relative to thread.esp0. */

#define PT_REG(reg)	((long)&((struct pt_regs *)0)->reg)
@@ -44,7 +46,7 @@ 
/* Mapping from PT_xxx to the stack offset at which the register is

   saved.  Notice that usp has no stack-slot and needs to be treated

   specially (see get_reg/put_reg below). */

static int regoff[] = {

static const int regoff[] = {

	[0]	= PT_REG(d1),

	[1]	= PT_REG(d2),

	[2]	= PT_REG(d3),
@@ -79,6 +81,14 @@ static inline long get_reg(struct task_struct *task, int regno) 
		addr = (unsigned long *)(task->thread.esp0 + regoff[regno]);

	else

		return 0;

	/* Need to take stkadj into account. */

	if (regno == PT_SR || regno == PT_PC) {

		long stkadj = *(long *)(task->thread.esp0 + PT_REG(stkadj));

		addr = (unsigned long *) ((unsigned long)addr + stkadj);

		/* The sr is actually a 16 bit register.  */

		if (regno == PT_SR)

			return *(unsigned short *)addr;

	}

	return *addr;

}
@@ -96,6 +106,16 @@ static inline int put_reg(struct task_struct *task, int regno, 
		addr = (unsigned long *)(task->thread.esp0 + regoff[regno]);

	else

		return -1;

	/* Need to take stkadj into account. */

	if (regno == PT_SR || regno == PT_PC) {

		long stkadj = *(long *)(task->thread.esp0 + PT_REG(stkadj));

		addr = (unsigned long *) ((unsigned long)addr + stkadj);

		/* The sr is actually a 16 bit register.  */

		if (regno == PT_SR) {

			*(unsigned short *)addr = data;

			return 0;

		}

	}

	*addr = data;

	return 0;

}
@@ -105,7 +125,7 @@ static inline int put_reg(struct task_struct *task, int regno, 
 */

static inline void singlestep_disable(struct task_struct *child)

{

	unsigned long tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);

	unsigned long tmp = get_reg(child, PT_SR) & ~TRACE_BITS;

	put_reg(child, PT_SR, tmp);

	clear_tsk_thread_flag(child, TIF_DELAYED_TRACE);

}
@@ -118,18 +138,30 @@ void ptrace_disable(struct task_struct *child) 
	singlestep_disable(child);

}



void user_enable_single_step(struct task_struct *child)

{

	unsigned long tmp = get_reg(child, PT_SR) & ~TRACE_BITS;

	put_reg(child, PT_SR, tmp | T1_BIT);

	set_tsk_thread_flag(child, TIF_DELAYED_TRACE);

}



void user_enable_block_step(struct task_struct *child)

{

	unsigned long tmp = get_reg(child, PT_SR) & ~TRACE_BITS;

	put_reg(child, PT_SR, tmp | T0_BIT);

}



void user_disable_single_step(struct task_struct *child)

{

	singlestep_disable(child);

}



long arch_ptrace(struct task_struct *child, long request, long addr, long data)

{

	unsigned long tmp;

	int i, ret = 0;



	switch (request) {

	/* when I and D space are separate, these will need to be fixed. */

	case PTRACE_PEEKTEXT:	/* read word at location addr. */

	case PTRACE_PEEKDATA:

		ret = generic_ptrace_peekdata(child, addr, data);

		break;



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

	case PTRACE_PEEKUSR:

		if (addr & 3)
@@ -138,8 +170,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 


		if (addr >= 0 && addr < 19) {

			tmp = get_reg(child, addr);

			if (addr == PT_SR)

				tmp >>= 16;

		} else if (addr >= 21 && addr < 49) {

			tmp = child->thread.fp[addr - 21];

			/* Convert internal fpu reg representation
@@ -149,16 +179,10 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
				tmp = ((tmp & 0xffff0000) << 15) |

				      ((tmp & 0x0000ffff) << 16);

		} else

			break;

			goto out_eio;

		ret = put_user(tmp, (unsigned long *)data);

		break;



	/* when I and D space are separate, this will have to be fixed. */

	case PTRACE_POKETEXT:	/* write the word at location addr. */

	case PTRACE_POKEDATA:

		ret = generic_ptrace_pokedata(child, addr, data);

		break;



	case PTRACE_POKEUSR:	/* write the word at location addr in the USER area */

		if (addr & 3)

			goto out_eio;
@@ -166,9 +190,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 


		if (addr == PT_SR) {

			data &= SR_MASK;

			data <<= 16;

			data |= get_reg(child, PT_SR) & ~(SR_MASK << 16);

		} else if (addr >= 0 && addr < 19) {

			data |= get_reg(child, PT_SR) & ~SR_MASK;

		}

		if (addr >= 0 && addr < 19) {

			if (put_reg(child, addr, data))

				goto out_eio;

		} else if (addr >= 21 && addr < 48) {
@@ -185,52 +209,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
			goto out_eio;

		break;



	case PTRACE_SYSCALL:	/* continue and stop at next (return from) syscall */

	case PTRACE_CONT:	/* restart after signal. */

		if (!valid_signal(data))

			goto out_eio;



		if (request == PTRACE_SYSCALL)

			set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);

		else

			clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);

		child->exit_code = data;

		singlestep_disable(child);

		wake_up_process(child);

		break;



	/*

	 * make the child exit.  Best I can do is send it a sigkill.

	 * perhaps it should be put in the status that it wants to

	 * exit.

	 */

	case PTRACE_KILL:

		if (child->exit_state == EXIT_ZOMBIE) /* already dead */

			break;

		child->exit_code = SIGKILL;

		singlestep_disable(child);

		wake_up_process(child);

		break;



	case PTRACE_SINGLESTEP:	/* set the trap flag. */

		if (!valid_signal(data))

			goto out_eio;



		clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE);

		tmp = get_reg(child, PT_SR) | (TRACE_BITS << 16);

		put_reg(child, PT_SR, tmp);

		set_tsk_thread_flag(child, TIF_DELAYED_TRACE);



		child->exit_code = data;

		/* give it a chance to run. */

		wake_up_process(child);

		break;



	case PTRACE_GETREGS:	/* Get all gp regs from the child. */

		for (i = 0; i < 19; i++) {

			tmp = get_reg(child, i);

			if (i == PT_SR)

				tmp >>= 16;

			ret = put_user(tmp, (unsigned long *)data);

			if (ret)

				break;
@@ -245,8 +226,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
				break;

			if (i == PT_SR) {

				tmp &= SR_MASK;

				tmp <<= 16;

				tmp |= get_reg(child, PT_SR) & ~(SR_MASK << 16);

				tmp |= get_reg(child, PT_SR) & ~SR_MASK;

			}

			put_reg(child, i, tmp);

			data += sizeof(long);

CRA Git | Maintained and supported by SUSTech CRA and CCSE