diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 15:00:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 15:00:55 -0700 |
| commit | 1b57c7c2fbb81763cd4a6940c8530c98022c409c (patch) | |
| tree | f9d6af50dd1485ccdb4bcdafb3899564b6e4f36a | |
| parent | 8d9095c667a185c8e2449632343a2b6c65ae58f1 (diff) | |
| parent | f58078dacaaf6fbe664d5404dca7f76dce576113 (diff) | |
Merge tag 'regmap-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap update from Mark Brown:
"Just one patch for regmap this time around, a change from Steven
Rostedt to prettify the way we're making the regmap internal header
available to the trace events (it turns out that the trace subsystem
doesn't actually need to be in trace/events)"
* tag 'regmap-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: Move tracing header into drivers/base/regmap
| -rw-r--r-- | drivers/base/regmap/Makefile | 3 | ||||
| -rw-r--r-- | drivers/base/regmap/regcache.c | 2 | ||||
| -rw-r--r-- | drivers/base/regmap/regmap.c | 2 | ||||
| -rw-r--r-- | drivers/base/regmap/trace.h (renamed from include/trace/events/regmap.h) | 8 |
4 files changed, 12 insertions, 3 deletions
diff --git a/drivers/base/regmap/Makefile b/drivers/base/regmap/Makefile index 0a533653ef3b..609e4c84f485 100644 --- a/drivers/base/regmap/Makefile +++ b/drivers/base/regmap/Makefile @@ -1,3 +1,6 @@ +# For include/trace/define_trace.h to include trace.h +CFLAGS_regmap.o := -I$(src) + obj-$(CONFIG_REGMAP) += regmap.o regcache.o obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o regcache-flat.o obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index 87db9893b463..7eb7b3b98794 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -15,8 +15,8 @@ #include <linux/export.h> #include <linux/slab.h> #include <linux/sort.h> -#include <trace/events/regmap.h> +#include "trace.h" #include "internal.h" static const struct regcache_ops *cache_types[] = { diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index dbfe6a69c3da..6273ff072f3e 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -20,7 +20,7 @@ #include <linux/sched.h> #define CREATE_TRACE_POINTS -#include <trace/events/regmap.h> +#include "trace.h" #include "internal.h" diff --git a/include/trace/events/regmap.h b/drivers/base/regmap/trace.h index 22317d2b52ab..64586a1c5a42 100644 --- a/include/trace/events/regmap.h +++ b/drivers/base/regmap/trace.h @@ -7,7 +7,7 @@ #include <linux/ktime.h> #include <linux/tracepoint.h> -#include "../../../drivers/base/regmap/internal.h" +#include "internal.h" /* * Log register events @@ -247,5 +247,11 @@ TRACE_EVENT(regcache_drop_region, #endif /* _TRACE_REGMAP_H */ +#undef TRACE_INCLUDE_PATH +#define TRACE_INCLUDE_PATH . + +#undef TRACE_INCLUDE_FILE +#define TRACE_INCLUDE_FILE trace + /* This part must be outside protection */ #include <trace/define_trace.h> |