| From 5a1454200daaf7e2ed0ec2ad17e960240af1f9ee Mon Sep 17 00:00:00 2001 |
| From: Cong Wang <amwang@redhat.com> |
| Date: Sun, 27 Nov 2011 13:27:00 +0800 |
| Subject: mmc: remove the second argument of k[un]map_atomic() |
| |
| Signed-off-by: Cong Wang <amwang@redhat.com> |
| Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> |
| Signed-off-by: Chris Ball <cjb@laptop.org> |
| (cherry picked from commit 482fce997e143a8d5429406fe066d31aa76ef70a) |
| |
| Conflicts: |
| |
| drivers/mmc/host/at91_mci.c |
| drivers/mmc/host/msm_sdcc.c |
| drivers/mmc/host/sdhci.c |
| drivers/mmc/host/tifm_sd.c |
| drivers/mmc/host/tmio_mmc.h |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| drivers/mmc/host/tmio_mmc.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h |
| index 3020f98..a95e6d9 100644 |
| --- a/drivers/mmc/host/tmio_mmc.h |
| +++ b/drivers/mmc/host/tmio_mmc.h |
| @@ -105,13 +105,13 @@ static inline char *tmio_mmc_kmap_atomic(struct scatterlist *sg, |
| unsigned long *flags) |
| { |
| local_irq_save(*flags); |
| - return kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg->offset; |
| + return kmap_atomic(sg_page(sg)) + sg->offset; |
| } |
| |
| static inline void tmio_mmc_kunmap_atomic(struct scatterlist *sg, |
| unsigned long *flags, void *virt) |
| { |
| - kunmap_atomic(virt - sg->offset, KM_BIO_SRC_IRQ); |
| + kunmap_atomic(virt - sg->offset); |
| local_irq_restore(*flags); |
| } |
| |
| -- |
| 1.7.10.2.565.gbd578b5 |
| |
