From 092a39b920756a7d47c9c0fdc751423177edfcb9 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Wed, 14 Mar 2012 21:51:10 -0400 Subject: [PATCH] --- yaml --- r: 292343 b: refs/heads/master c: 38eff2892628fa5c4fc8962a17b7296f42833ebe h: refs/heads/master i: 292341: 220760259610f48f5ff8d69253b2ed298acff9e2 292339: ab98ef093efde1e121565c86e6040bbd7a243e01 292335: 7f0802ca1b5a389a969ee35bd8e5a2b79bb4ac58 v: v3 --- [refs] | 2 +- trunk/include/linux/trace_seq.h | 4 ++-- trunk/kernel/trace/trace_output.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a55c0d3a2108..ff332b101c96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66b3fad3f4c535c92b6a1184d535a97d6aa5d82a +refs/heads/master: 38eff2892628fa5c4fc8962a17b7296f42833ebe diff --git a/trunk/include/linux/trace_seq.h b/trunk/include/linux/trace_seq.h index 7dadc3df0c77..a32d86ec8bf2 100644 --- a/trunk/include/linux/trace_seq.h +++ b/trunk/include/linux/trace_seq.h @@ -44,7 +44,7 @@ extern int trace_seq_putmem(struct trace_seq *s, const void *mem, size_t len); extern int trace_seq_putmem_hex(struct trace_seq *s, const void *mem, size_t len); extern void *trace_seq_reserve(struct trace_seq *s, size_t len); -extern int trace_seq_path(struct trace_seq *s, struct path *path); +extern int trace_seq_path(struct trace_seq *s, const struct path *path); #else /* CONFIG_TRACING */ static inline int trace_seq_printf(struct trace_seq *s, const char *fmt, ...) @@ -88,7 +88,7 @@ static inline void *trace_seq_reserve(struct trace_seq *s, size_t len) { return NULL; } -static inline int trace_seq_path(struct trace_seq *s, struct path *path) +static inline int trace_seq_path(struct trace_seq *s, const struct path *path) { return 0; } diff --git a/trunk/kernel/trace/trace_output.c b/trunk/kernel/trace/trace_output.c index 0d6ff3555942..690987198ad7 100644 --- a/trunk/kernel/trace/trace_output.c +++ b/trunk/kernel/trace/trace_output.c @@ -264,7 +264,7 @@ void *trace_seq_reserve(struct trace_seq *s, size_t len) return ret; } -int trace_seq_path(struct trace_seq *s, struct path *path) +int trace_seq_path(struct trace_seq *s, const struct path *path) { unsigned char *p;