ARM: OMAP: Fix consistent_sync properly

Turns out the problem was not in consistent_sync(), but blockops.c
overriding the the dmac_ functions with buggy ones... Undo previous
commit a9a31cc4ef3830e31766f03f55daa4b43e1d6dac, and remove blockops.c
from Makefile until it's completely removed from mainline kernel.

diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile
index 59f47d4c2dfe6edf22560b861d6a3d554104dbf1..ffe73ba2bf174d857738d986d1c30240d49bcf50 100644 (file)
--- a/arch/arm/mm/Makefile
+++ b/arch/arm/mm/Makefile
@@ -51,4 +51,4 @@ obj-$(CONFIG_CPU_ARM1026)     += proc-arm1026.o
 obj-$(CONFIG_CPU_SA110)                += proc-sa110.o
 obj-$(CONFIG_CPU_SA1100)       += proc-sa1100.o
 obj-$(CONFIG_CPU_XSCALE)       += proc-xscale.o
-obj-$(CONFIG_CPU_V6)           += proc-v6.o blockops.o
+obj-$(CONFIG_CPU_V6)           += proc-v6.o

diff --git a/arch/arm/mm/consistent.c b/arch/arm/mm/consistent.c
index a1ed07d2b56423e8fc1ec827d70819c97fca1212..26356ce4da5448165bcac172139deef54a008462 100644 (file)
--- a/arch/arm/mm/consistent.c
+++ b/arch/arm/mm/consistent.c
@@ -432,7 +432,7 @@ core_initcall(consistent_init);
 void consistent_sync(void *vaddr, size_t size, int direction)
 {
        unsigned long start = (unsigned long)vaddr;
-       unsigned long end   = start + size - 1;
+       unsigned long end   = start + size;
 
        switch (direction) {
        case DMA_FROM_DEVICE:           /* invalidate only */