X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=lttng-events.c;h=2fedbea59202df8da309a6b24fb348b37db1092c;hb=57be518d19d7c433f79c57cd7815160110ac19c2;hp=fba5a8eb8fbcd304cd02d2c700d5ebdc47ac83b2;hpb=5f5ddf015e2f7aea813b99ef61d80a7af051c5b9;p=lttng-modules.git diff --git a/lttng-events.c b/lttng-events.c index fba5a8eb..2fedbea5 100644 --- a/lttng-events.c +++ b/lttng-events.c @@ -1,11 +1,23 @@ /* * lttng-events.c * - * Copyright 2010-2011 (c) - Mathieu Desnoyers - * * Holds LTTng per-session event registry. * - * Dual LGPL v2.1/GPL v2 license. + * Copyright (C) 2010-2012 Mathieu Desnoyers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; only + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include @@ -875,7 +887,7 @@ uint64_t measure_clock_offset(void) local_irq_restore(flags); offset = (monotonic[0] + monotonic[1]) >> 1; - realtime = rts.tv_sec * NSEC_PER_SEC; + realtime = (uint64_t) rts.tv_sec * NSEC_PER_SEC; realtime += rts.tv_nsec; offset = realtime - offset; return offset;