summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDylan Reid <dgreid@chromium.org>2015-03-02 17:09:07 -0800
committerBrian Norris <briannorris@google.com>2016-03-01 12:03:20 -0800
commit4658d931f6072f6998c2ea0f43d87111a1fc8a2e (patch)
tree6d90699d72df9b34294679dd72f3ae2f7e75aa3d /drivers
parent4861be8f9e494d76b571657a067c0e525230391a (diff)
ANDROID: mmc: Move tracepoint creation and export symbols
Move the tracepoint creation to core from card, as core shouldn't depend on card. Also add EXPORT_SYMBOL_GPL calls to enable module build. Change-Id: Ie39fcdadc0516df99600d0963efe09b6cd7a9bf8 Signed-off-by: Dylan Reid <dgreid@chromium.org> (cherry picked from commit da5fbd1e7e50fee3a8271f50d25c848d0ede64b3, from android-3.14) Signed-off-by: Brian Norris <briannorris@google.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/card/block.c1
-rw-r--r--drivers/mmc/core/core.c6
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 21aa3244029b..90e9738a129a 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -36,7 +36,6 @@
#include <linux/compat.h>
#include <linux/pm_runtime.h>
-#define CREATE_TRACE_POINTS
#include <trace/events/mmc.h>
#include <linux/mmc/ioctl.h>
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 3e54185bc985..9fab52559a8c 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -30,6 +30,7 @@
#include <linux/slab.h>
#include <linux/of.h>
+#define CREATE_TRACE_POINTS
#include <trace/events/mmc.h>
#include <linux/mmc/card.h>
@@ -48,6 +49,11 @@
#include "sd_ops.h"
#include "sdio_ops.h"
+EXPORT_TRACEPOINT_SYMBOL_GPL(mmc_blk_erase_start);
+EXPORT_TRACEPOINT_SYMBOL_GPL(mmc_blk_erase_end);
+EXPORT_TRACEPOINT_SYMBOL_GPL(mmc_blk_rw_start);
+EXPORT_TRACEPOINT_SYMBOL_GPL(mmc_blk_rw_end);
+
/* If the device is not responding */
#define MMC_CORE_TIMEOUT_MS (10 * 60 * 1000) /* 10 minute timeout */