Re: [PATCH] Fixup armksyms to work with _printk

Mathieu Desnoyers <[email protected]>
Newsgroups gmane.linux.kernel.tracing
Message-ID <20061005133932.GA10468@Krystal>
Applied in 0.6.4, thanks!

Mathieu

* Deepak Saxena ([email protected]) wrote:
> On Oct 04 2006, at 17:49, Mathieu Desnoyers was caught saying:
> > Oops, sorry, replied too fast.
> > 
> > You are right, ARM does not define this flag. We'll have to find a workaround...
> > tomorrow :)
> 
> Patch against 2.6.17 git tree.
> 
> diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
> index 2a25e60..dc3200e 100644
> --- a/arch/arm/kernel/entry-common.S
> +++ b/arch/arm/kernel/entry-common.S
> @@ -79,7 +79,7 @@ ENTRY(ret_from_fork)
>  	get_thread_info tsk
>  	ldr	r1, [tsk, #TI_FLAGS]		@ check for syscall tracing
>  	mov	why, #1
> -	tst	r1, #_TIF_SYSCALL_TRACE		@ are we tracing syscalls?
> +	tst	r1, #_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT @ are we tracing syscalls?
>  	beq	ret_slow_syscall
>  	mov	r1, sp
>  	mov	r0, #1				@ trace exit [IP = 1]
> @@ -198,7 +198,7 @@ #elif !defined(CONFIG_AEABI)
>  #endif
>  
>  	stmdb	sp!, {r4, r5}			@ push fifth and sixth args
> -	tst	ip, #_TIF_SYSCALL_TRACE		@ are we tracing syscalls?
> +	tst	ip, #_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT @ are we tracing syscalls?
>  	bne	__sys_trace
>  
>  	cmp	scno, #NR_syscalls		@ check upper syscall limit
> diff --git a/include/asm-arm/thread_info.h b/include/asm-arm/thread_info.h
> index cfbccb6..29f17aa 100644
> --- a/include/asm-arm/thread_info.h
> +++ b/include/asm-arm/thread_info.h
> @@ -122,10 +122,12 @@ #define PREEMPT_ACTIVE	0x40000000
>   *  TIF_NEED_RESCHED	- rescheduling necessary
>   *  TIF_USEDFPU		- FPU was used by this task this quantum (SMP)
>   *  TIF_POLLING_NRFLAG	- true if poll_idle() is polling TIF_NEED_RESCHED
> + *  TIF_SYSCALL_TRACE	- Syscall audting active - LTTng
>   */
>  #define TIF_NOTIFY_RESUME	0
>  #define TIF_SIGPENDING		1
>  #define TIF_NEED_RESCHED	2
> +#define	TIF_SYSCALL_AUDIT	7
>  #define TIF_SYSCALL_TRACE	8
>  #define TIF_POLLING_NRFLAG	16
>  #define TIF_USING_IWMMXT	17
> @@ -135,6 +137,7 @@ #define _TIF_NOTIFY_RESUME	(1 << TIF_NOT
>  #define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)
>  #define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)
>  #define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
> +#define	_TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)
>  #define _TIF_POLLING_NRFLAG	(1 << TIF_POLLING_NRFLAG)
>  #define _TIF_USING_IWMMXT	(1 << TIF_USING_IWMMXT)
>  
> -- 
> Deepak Saxena - [email protected] - http://www.plexity.net
> 
> "An open heart has no possessions, only experiences" - Matt Bibbeau
> 
OpenPGP public key:              http://krystal.dyndns.org:8080/key/compudj.gpg
Key fingerprint:     8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.