shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix a build breakage in IO latency hist code.

Browse Source 
Fix a build breakage where MMC is enabled, but BLOCK is not.

Change-Id: I0eb422d12264f0371f3368ae7c37342ef9efabaa
Signed-off-by: Mohan Srinivasan <srmohan@google.com>
This commit is contained in:
Mohan Srinivasan
2016-10-03 16:17:34 -07:00
committed by Amit Pundir
parent fb5727b2d4
commit f79fcde0ef
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mmc/core/core.c
View File

@@ -183,6 +183,7 @@ void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq)
pr_debug("%s: %d bytes transferred: %d\n",
mmc_hostname(host),
mrq->data->bytes_xfered, mrq->data->error);
#ifdef CONFIG_BLOCK
if (mrq->lat_hist_enabled) {
ktime_t completion;
u_int64_t delta_us;
@@ -194,6 +195,7 @@ void mmc_request_done(struct mmc_host *host, struct mmc_request *mrq)
(mrq->data->flags & MMC_DATA_READ),
delta_us);
}
#endif
trace_mmc_blk_rw_end(cmd->opcode, cmd->arg, mrq->data);
}
@@ -638,11 +640,13 @@ struct mmc_async_req *mmc_start_req(struct mmc_host *host,
}
if (!err && areq) {
#ifdef CONFIG_BLOCK
if (host->latency_hist_enabled) {
areq->mrq->io_start = ktime_get();
areq->mrq->lat_hist_enabled = 1;
} else
areq->mrq->lat_hist_enabled = 0;
#endif
trace_mmc_blk_rw_start(areq->mrq->cmd->opcode,
areq->mrq->cmd->arg,
areq->mrq->data);
@@ -2923,6 +2927,7 @@ static void __exit mmc_exit(void)
destroy_workqueue(workqueue);
}
#ifdef CONFIG_BLOCK
static ssize_t
latency_hist_show(struct device *dev, struct device_attribute *attr, char *buf)
{
@@ -2970,6 +2975,7 @@ mmc_latency_hist_sysfs_exit(struct mmc_host *host)
{
device_remove_file(&host->class_dev, &dev_attr_latency_hist);
}
#endif
subsys_initcall(mmc_init);
module_exit(mmc_exit);

4
drivers/mmc/core/host.c
View File

@@ -392,7 +392,9 @@ int mmc_add_host(struct mmc_host *host)
mmc_add_host_debugfs(host);
#endif
#ifdef CONFIG_BLOCK
mmc_latency_hist_sysfs_init(host);
#endif
mmc_start_host(host);
if (!(host->pm_flags & MMC_PM_IGNORE_PM_NOTIFY))
@@ -422,7 +424,9 @@ void mmc_remove_host(struct mmc_host *host)
mmc_remove_host_debugfs(host);
#endif
#ifdef CONFIG_BLOCK
mmc_latency_hist_sysfs_exit(host);
#endif
device_del(&host->class_dev);

2
include/linux/mmc/core.h
View File

@@ -137,7 +137,9 @@ struct mmc_request {
void (*done)(struct mmc_request *);/* completion function */
struct mmc_host *host;
ktime_t io_start;
#ifdef CONFIG_BLOCK
int lat_hist_enabled;
#endif
};
struct mmc_card;