Merge tag 'for-linus-20160527' of git://git.infradead.org/linux-mtd

[mirror_ubuntu-bionic-kernel.git] / kernel / trace / tracing_map.h

diff --git a/kernel/trace/tracing_map.h b/kernel/trace/tracing_map.h
index 1f7eda5487873a94d7ad8a781ba48b349f6a7dc5..618838f5f30acaa3c4ab78c7b19329128e1b56b7 100644 (file)
--- 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);