Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[mv-sheeva.git] / drivers / edac / edac_mc.c

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 690cbf15a007ccbe27fad5d9f7b55c033dcd7148..feef7733fae7702733feb642bfcf0ac7c431f484 100644 (file)
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -620,13 +620,13 @@ static void edac_mc_scrub_block(unsigned long page, unsigned long offset,
        if (PageHighMem(pg))
                local_irq_save(flags);
 
-       virt_addr = kmap_atomic(pg, KM_BOUNCE_READ);
+       virt_addr = kmap_atomic(pg);
 
        /* Perform architecture specific atomic scrub operation */
        atomic_scrub(virt_addr + offset, size);
 
        /* Unmap and complete */
-       kunmap_atomic(virt_addr, KM_BOUNCE_READ);
+       kunmap_atomic(virt_addr);
 
        if (PageHighMem(pg))
                local_irq_restore(flags);