summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohan Srinivasan <srmohan@google.com>2016-09-07 17:39:42 -0700
committerTodd Kjos <tkjos@google.com>2016-09-08 00:46:58 +0000
commit65a2cd6d500d2620e5a5aa156b518d5fd25d492a (patch)
tree768bb2649b126507c82ac187b5786d0b47dd5c87
parent6b93f8214eabf0f363eab5283c2ad18b5bc33135 (diff)
Android: Fix build breakages.
The IO latency histogram change broke allmodconfig and allnoconfig builds. This fixes those breakages. Change-Id: I9cdae655b40ed155468f3cef25cdb74bb56c4d3e Signed-off-by: Mohan Srinivasan <srmohan@google.com>
-rw-r--r--block/blk-core.c2
-rw-r--r--include/linux/mmc/host.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 840713279726..64f3455a83ef 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -3560,6 +3560,7 @@ blk_zero_latency_hist(struct io_latency_state *s)
s->latency_reads_elems = 0;
s->latency_writes_elems = 0;
}
+EXPORT_SYMBOL(blk_zero_latency_hist);
ssize_t
blk_latency_hist_show(struct io_latency_state *s, char *buf)
@@ -3621,3 +3622,4 @@ blk_latency_hist_show(struct io_latency_state *s, char *buf)
}
return bytes_written;
}
+EXPORT_SYMBOL(blk_latency_hist_show);
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index e4862f7cdede..97b2b0b1f99d 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -380,8 +380,10 @@ struct mmc_host {
} embedded_sdio_data;
#endif
+#ifdef CONFIG_BLOCK
int latency_hist_enabled;
struct io_latency_state io_lat_s;
+#endif
unsigned long private[0] ____cacheline_aligned;
};