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>

diff --git a/block/blk-core.c b/block/blk-core.c
index b20ada4ad68e7a31ac54a55dee7acf9fa3b5ca87..32e5bd63f6ae3329ba0faeaf104dbe487b87b2d6 100644 (file)
--- 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 e4862f7cdede8080acc6f1ae5c81f8183572a2ee..97b2b0b1f99de03af7c6c7f56afc554fcca4aefd 100644 (file)
--- 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;
 };