Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	arch/x86/kernel/io_apic.c

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index bafb7d1a22e2..97cd9e0f66f6 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -259,6 +259,12 @@ static int tx4939ide_build_dmatable(ide_drive_t *drive, struct request *rq)
                         bcount = 0x10000 - (cur_addr & 0xffff);
                         if (bcount > cur_len)
                                 bcount = cur_len;
+                        /*
+                         * This workaround for zero count seems required.
+                         * (standard ide_build_dmatable do it too)
+                         */
+                        if ((bcount & 0xffff) == 0x0000)
+                                bcount = 0x8000;
                         *table++ = bcount & 0xffff;
                         *table++ = cur_addr;
                         cur_addr += bcount;
@@ -558,7 +564,7 @@ static void tx4939ide_input_data_swap(ide_drive_t *drive, struct request *rq,
 
         while (count--)
                 *ptr++ = cpu_to_le16(__raw_readw((void __iomem *)port));
-        __ide_flush_dcache_range((unsigned long)buf, count * 2);
+        __ide_flush_dcache_range((unsigned long)buf, roundup(len, 2));
 }
 
 static void tx4939ide_output_data_swap(ide_drive_t *drive, struct request *rq,
@@ -572,7 +578,7 @@ static void tx4939ide_output_data_swap(ide_drive_t *drive, struct request *rq,
                 __raw_writew(le16_to_cpu(*ptr), (void __iomem *)port);
                 ptr++;
         }
-        __ide_flush_dcache_range((unsigned long)buf, count * 2);
+        __ide_flush_dcache_range((unsigned long)buf, roundup(len, 2));
 }
 
 static const struct ide_tp_ops tx4939ide_tp_ops = {