diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-12-14 20:33:33 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-12-14 20:33:33 -0800 |
| commit | 3169cab06bf18e3b6f5bd68dd253502aba0eb9c4 (patch) | |
| tree | 83a5ef854b7bde3f1b440b81f226aacdacdfebb4 | |
| parent | 387c9643f0e352b47267983730f0f8ea866ca9a3 (diff) | |
| parent | 3daddaa28cbf7330e6b0fd38241b28458a89a52f (diff) | |
Merge branch 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.18-androidlsk-v3.18-15.12-android
| -rw-r--r-- | arch/arm/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/mmc/card/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/mmc/card/block.c | 11 |
3 files changed, 3 insertions, 20 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 424f1576b651..3a350d35901c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -297,10 +297,12 @@ config MMU support by paged memory management. If unsure, say 'Y'. config ARCH_MMAP_RND_BITS_MIN + depends on MMU int default 8 config ARCH_MMAP_RND_BITS_MAX + depends on MMU int default 14 if MMU && PAGE_OFFSET=0x40000000 default 15 if MMU && PAGE_OFFSET=0x80000000 @@ -308,6 +310,7 @@ config ARCH_MMAP_RND_BITS_MAX default 8 config ARCH_MMAP_RND_BITS + depends on MMU int "Number of bits to use for ASLR of mmap base address" if EXPERT range ARCH_MMAP_RND_BITS_MIN ARCH_MMAP_RND_BITS_MAX default ARCH_MMAP_RND_BITS_MIN diff --git a/drivers/mmc/card/Kconfig b/drivers/mmc/card/Kconfig index 79d82124413f..5562308699bc 100644 --- a/drivers/mmc/card/Kconfig +++ b/drivers/mmc/card/Kconfig @@ -50,15 +50,6 @@ config MMC_BLOCK_BOUNCE If unsure, say Y here. -config MMC_BLOCK_DEFERRED_RESUME - bool "Deferr MMC layer resume until I/O is requested" - depends on MMC_BLOCK - default n - help - Say Y here to enable deferred MMC resume until I/O - is requested. This will reduce overall resume latency and - save power when theres an SD card inserted but not being used. - config SDIO_UART tristate "SDIO UART/GPS class support" depends on TTY diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index ded5e5ec0a3a..66ff2a01ebfc 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -2036,11 +2036,6 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) unsigned long flags; unsigned int cmd_flags = req ? req->cmd_flags : 0; -#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME - if (mmc_bus_needs_resume(card->host)) - mmc_resume_bus(card->host); -#endif - if (req && !mq->mqrq_prev->req) /* claim host only for the first request */ mmc_get_card(card); @@ -2480,9 +2475,6 @@ static int mmc_blk_probe(struct mmc_card *card) mmc_set_drvdata(card, md); -#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME - mmc_set_bus_resume_policy(card->host, 1); -#endif if (mmc_add_disk(md)) goto out; @@ -2525,9 +2517,6 @@ static void mmc_blk_remove(struct mmc_card *card) pm_runtime_put_noidle(&card->dev); mmc_blk_remove_req(md); mmc_set_drvdata(card, NULL); -#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME - mmc_set_bus_resume_policy(card->host, 0); -#endif } static int _mmc_blk_suspend(struct mmc_card *card) |