Merge branch 'i2c/for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[firefly-linux-kernel-4.4.55.git] / kernel / trace / trace_seq.c

diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
index 88c0f80f0a1f2a6283eb31460917e14a99f263b7..1f24ed99dca240f22de5673ca1ca1e64617886a6 100644 (file)
--- a/kernel/trace/trace_seq.c
+++ b/kernel/trace/trace_seq.c
@@ -341,36 +341,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