Commit f3e2628b authored Jan 05, 2006 by Evgeniy Polyakov Committed by Russell King Jan 05, 2006

[MMC] mmci: kunmap_atomic() unmaps virtual address, not page



Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent e9c091b4

drivers/mmc/mmci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -300,7 +300,7 @@ static irqreturn_t mmci_pio_irq(int irq, void dev_id, struct pt_regs regs)
		/*
		* Unmap the buffer.
		*/
		mmci_kunmap_atomic(host, &flags);
		mmci_kunmap_atomic(host, buffer, &flags);

		host->sg_off += len;
		host->size -= len;

drivers/mmc/mmci.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -172,8 +172,8 @@ static inline char mmci_kmap_atomic(struct mmci_host host, unsigned long *flag
		return kmap_atomic(sg->page, KM_BIO_SRC_IRQ) + sg->offset;
		}

		static inline void mmci_kunmap_atomic(struct mmci_host host, unsigned long flags)
		static inline void mmci_kunmap_atomic(struct mmci_host host, void buffer, unsigned long *flags)
		{
		kunmap_atomic(host->sg_ptr->page, KM_BIO_SRC_IRQ);
		kunmap_atomic(buffer, KM_BIO_SRC_IRQ);
		local_irq_restore(*flags);
		}