summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-03 11:24:46 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-03 11:24:46 -0700
commit447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6 (patch)
tree676e741f2552c9cb301e1e49c557b92bf8940f55 /samples
parent3049683eafdbbbd7350b0e5ca02a2d8c026a3362 (diff)
parent042e1c79166b9250edd8262bea84e1703f27ad2e (diff)
downloadop-kernel-dev-447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6.zip
op-kernel-dev-447a8b858e4bda41c394b1bc7fdbc9dc0bdf44f6.tar.gz
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.18.
Diffstat (limited to 'samples')
-rw-r--r--samples/trace_events/trace-events-sample.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/trace_events/trace-events-sample.h b/samples/trace_events/trace-events-sample.h
index 4b0113f..4764292 100644
--- a/samples/trace_events/trace-events-sample.h
+++ b/samples/trace_events/trace-events-sample.h
@@ -87,7 +87,7 @@ TRACE_EVENT(foo_bar,
),
TP_fast_assign(
- strncpy(__entry->foo, foo, 10);
+ strlcpy(__entry->foo, foo, 10);
__entry->bar = bar;
),
OpenPOWER on IntegriCloud