diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-13 13:32:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-13 13:32:07 -0700 |
| commit | 3423166fdbc2444bf3a4a27af1d7508364a17be7 (patch) | |
| tree | 0a42bd5fbe6bcca79802bf1ec5af6acf12aadd82 /include/linux/trace_seq.h | |
| parent | e9b57cca3dbdc7a0b90514af8bf613baf97105a5 (diff) | |
| parent | 7d93101fc71ec47c7cc66ac99f76ef795c5207aa (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Diffstat (limited to 'include/linux/trace_seq.h')
| -rw-r--r-- | include/linux/trace_seq.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/trace_seq.h b/include/linux/trace_seq.h index 7dadc3df0c77..a32d86ec8bf2 100644 --- a/include/linux/trace_seq.h +++ b/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; } |