svn commit: r244445 - in head/sys: kern sys tools

[Konstantin Belousov]

On Thu, Dec 27, 2012 at 06:25:34PM -0800, Oleksandr Tymoshenko wrote:
> On 12/27/2012 6:14 PM, Konstantin Belousov wrote:
> > On Thu, Dec 27, 2012 at 06:03:26PM -0800, Oleksandr Tymoshenko wrote:
> >> On 12/19/2012 12:10 PM, Jeff Roberson wrote:
> >>> Author: jeff
> >>> Date: Wed Dec 19 20:10:00 2012
> >>> New Revision: 244445
> >>> URL: http://svnweb.freebsd.org/changeset/base/244445
> >>>
> >>> Log:
> >>>      - Add new machine parsable KTR macros for timing events.
> >>>      - Use this new format to automatically handle syscalls and VOPs.  This
> >>>        changes the earlier format but is still human readable.
> >>>     
> >>>     Sponsored by:	EMC / Isilon Storage Division
> >> Jeff,
> >>
> >> please fix tinderbox breakage caused by this commit
> >>
> >> ARM kernel build with KTR option is still broken as of today:
> >>
> >> http://tinderbox.freebsd.org/tinderbox-head-ss-build-HEAD-arm-arm.brief
> >>
> >> In file included from /src/sys/arm/arm/trap.c:900:
> >> /src/sys/arm/arm/../../kern/subr_syscall.c: In function 'syscallenter':
> >> /src/sys/arm/arm/../../kern/subr_syscall.c:80: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
> >> /src/sys/arm/arm/../../kern/subr_syscall.c:154: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
> >> *** [trap.o] Error code 1
> >>
> >>
> >> Thank you
> > I am running a fix through the make universe right now.
> > If you can compile just ARM and confirm that gcc is silenced by this,
> > I will commit it before make universe finishes.
> >
> > diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c
> > index 3dcfcf5..349b410 100644
> > --- a/sys/kern/subr_syscall.c
> > +++ b/sys/kern/subr_syscall.c
> > @@ -77,7 +77,7 @@ syscallenter(struct thread *td, struct syscall_args *sa)
> >   	if (KTRPOINT(td, KTR_SYSCALL))
> >   		ktrsyscall(sa->code, sa->narg, sa->args);
> >   #endif
> > -	KTR_START4(KTR_SYSC, "syscall", syscallname(p, sa->code),
> > +	KTR_START4(KTR_SYSC, "syscall", (uintptr_t)syscallname(p, sa->code),
> >   	    td, "pid:%d", td->td_proc->p_pid, "arg0:%p", sa->args[0],
> >   	    "arg1:%p", sa->args[1], "arg2:%p", sa->args[2]);
> >   
> > @@ -151,7 +151,7 @@ syscallenter(struct thread *td, struct syscall_args *sa)
> >   		syscall_thread_exit(td, sa->callp);
> >   	}
> >    retval:
> > -	KTR_STOP4(KTR_SYSC, "syscall", syscallname(p, sa->code),
> > +	KTR_STOP4(KTR_SYSC, "syscall", (uintptr_t)syscallname(p, sa->code),
> >   	    td, "pid:%d", td->td_proc->p_pid, "error:%d", error,
> >   	    "retval0:%#lx", td->td_retval[0], "retval1:%#lx",
> >   	    td->td_retval[1]);
> 
> Didn't help. It's td, not sysclalname result that gcc complains about:
> 
> http://people.freebsd.org/~gonzo/patches/ktr-syscall-fix.diff
Ok, commit ? Assuming it compiles.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 834 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20121228/98fccd19/attachment.sig>