2 files changed, 5 insertions, 4 deletions

diff --git a/kernel/trace/tracing_map.c b/kernel/trace/tracing_map.c
index dd6401dd145e..e0f172932eca 100644
--- a/kernel/trace/tracing_map.c
+++ b/kernel/trace/tracing_map.c
@@ -163,7 +163,7 @@ static int tracing_map_add_field(struct tracing_map *map,
  * tracing_map_update_sum() or reading it via tracing_map_read_sum().
  *
  * Return: The index identifying the field in the map and associated
- * tracing_map_elts.
+ * tracing_map_elts, or -EINVAL on error.
  */
 int tracing_map_add_sum_field(struct tracing_map *map)
 {
@@ -184,7 +184,7 @@ int tracing_map_add_sum_field(struct tracing_map *map)
  * the key referenced by this key field resides.
  *
  * Return: The index identifying the field in the map and associated
- * tracing_map_elts.
+ * tracing_map_elts, or -EINVAL on error.
  */
 int tracing_map_add_key_field(struct tracing_map *map,
                               unsigned int offset,
diff --git a/kernel/trace/tracing_map.h b/kernel/trace/tracing_map.h
index 1f7eda548787..618838f5f30a 100644
--- a/kernel/trace/tracing_map.h
+++ b/kernel/trace/tracing_map.h
@@ -5,9 +5,10 @@
 #define TRACING_MAP_BITS_MAX            17
 #define TRACING_MAP_BITS_MIN            7
 
-#define TRACING_MAP_FIELDS_MAX          4
 #define TRACING_MAP_KEYS_MAX            2
-
+#define TRACING_MAP_VALS_MAX            3
+#define TRACING_MAP_FIELDS_MAX          (TRACING_MAP_KEYS_MAX + \
+                                         TRACING_MAP_VALS_MAX)
 #define TRACING_MAP_SORT_KEYS_MAX       2
 
 typedef int (*tracing_map_cmp_fn_t) (void *val_a, void *val_b);