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

Commit c8a2786b authored Aug 17, 2010 by Philippe De Muyter Committed by Greg Ungerer Oct 21, 2010

m68knommu: fix strace support for 68328/68360



strace enabled is marked using the `flags' field of the `thread_info' struct.
68360 version of entry.S did test a wrong bit in a wrong structure
(task_struct).

68328 version of entry.S did test the right bit in the right structure,
but wrongly, because the `flags' field is 32 bit wide, while the used
assembler insn (btst) only accesses a 8 bit byte in memory.

Fix both using code already used in the coldfire version of entry.S

Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>

parent 47422259

arch/m68knommu/platform/68328/entry.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ ENTRY(system_call)
		movel %sp,%d1 /* get thread_info pointer */
		andl #-THREAD_SIZE,%d1
		movel %d1,%a2
		btst #TIF_SYSCALL_TRACE,%a2@(TI_FLAGS)
		btst #(TIF_SYSCALL_TRACE%8),%a2@(TI_FLAGS+(31-TIF_SYSCALL_TRACE)/8)
		jne do_trace
		cmpl #NR_syscalls,%d0
		jcc badsys

arch/m68knommu/platform/68360/entry.S

+6 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,12 @@ ENTRY(system_call)
		jbsr set_esp0
		addql #4,%sp

		btst #PF_TRACESYS_BIT,%a2@(TASK_FLAGS+PF_TRACESYS_OFF)
		movel %sp@(PT_OFF_ORIG_D0),%d0

		movel %sp,%d1 /* get thread_info pointer */
		andl #-THREAD_SIZE,%d1
		movel %d1,%a2
		btst #(TIF_SYSCALL_TRACE%8),%a2@(TI_FLAGS+(31-TIF_SYSCALL_TRACE)/8)
		jne do_trace
		cmpl #NR_syscalls,%d0
		jcc badsys