aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-06-23 16:42:07 -0400
committerSteven Rostedt <rostedt@goodmis.org>2014-07-01 07:13:37 -0400
commit9096032fbcdcdb80b76f1046346499e20417988e (patch)
treef4f0a3653f5c76c472c2ee6b6a03381b30223610
parenttracing: Make trace_seq_putmem_hex() more robust (diff)
downloadlinux-dev-9096032fbcdcdb80b76f1046346499e20417988e.tar.xz
linux-dev-9096032fbcdcdb80b76f1046346499e20417988e.zip
tracing: Remove trace_seq_reserve()
trace_seq_reserve() has no users in the kernel, it just wastes space. Remove it. Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--include/linux/trace_seq.h5
-rw-r--r--kernel/trace/trace_seq.c30
2 files changed, 0 insertions, 35 deletions
diff --git a/include/linux/trace_seq.h b/include/linux/trace_seq.h
index 8283762ab7ef..dd85753e1bb0 100644
--- a/include/linux/trace_seq.h
+++ b/include/linux/trace_seq.h
@@ -43,7 +43,6 @@ extern int trace_seq_putc(struct trace_seq *s, unsigned char c);
extern int trace_seq_putmem(struct trace_seq *s, const void *mem, unsigned int len);
extern int trace_seq_putmem_hex(struct trace_seq *s, const void *mem,
unsigned int len);
-extern void *trace_seq_reserve(struct trace_seq *s, unsigned int len);
extern int trace_seq_path(struct trace_seq *s, const struct path *path);
extern int trace_seq_bitmask(struct trace_seq *s, const unsigned long *maskp,
@@ -94,10 +93,6 @@ static inline int trace_seq_putmem_hex(struct trace_seq *s, const void *mem,
{
return 0;
}
-static inline void *trace_seq_reserve(struct trace_seq *s, unsigned int len)
-{
- return NULL;
-}
static inline int trace_seq_path(struct trace_seq *s, const struct path *path)
{
return 0;
diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
index 88c0f80f0a1f..1f24ed99dca2 100644
--- a/kernel/trace/trace_seq.c
+++ b/kernel/trace/trace_seq.c
@@ -342,36 +342,6 @@ int trace_seq_putmem_hex(struct trace_seq *s, const void *mem,
EXPORT_SYMBOL_GPL(trace_seq_putmem_hex);
/**
- * trace_seq_reserve - reserve space on the sequence buffer
- * @s: trace sequence descriptor
- * @len: The amount to reserver.
- *
- * If for some reason there is a need to save some space on the
- * buffer to fill in later, this function is used for that purpose.
- * The given length will be reserved and the pointer to that
- * location on the buffer is returned, unless there is not enough
- * buffer left to hold the given length then NULL is returned.
- */
-void *trace_seq_reserve(struct trace_seq *s, unsigned int len)
-{
- void *ret;
-
- if (s->full)
- return NULL;
-
- if (len > TRACE_SEQ_BUF_LEFT(s)) {
- s->full = 1;
- return NULL;
- }
-
- ret = s->buffer + s->len;
- s->len += len;
-
- return ret;
-}
-EXPORT_SYMBOL_GPL(trace_seq_reserve);
-
-/**
* trace_seq_path - copy a path into the sequence buffer
* @s: trace sequence descriptor
* @path: path to write into the sequence buffer.