Author: tbm
Date: Fri Nov 30 08:33:09 2007
New Revision: 9845

Log:
revert the try-dma-copy-to-user patch again since Gordon found it
leads to data corruption on GLAN Tank.


Removed:
   dists/sid/linux-2.6/debian/patches/bugfix/arm/try-dma-copy-to-user.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/arm/config.iop32x
   dists/sid/linux-2.6/debian/patches/series/1

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog        (original)
+++ dists/sid/linux-2.6/debian/changelog        Fri Nov 30 08:33:09 2007
@@ -49,7 +49,6 @@
     options.
   * [mipsel/r5k-cobalt] Enable the modern Cobalt LEDs driver.
   * [arm/iop32x] Enable Intel IOP ADMA support.
-  * [arm/iop32x] Backport and enable POLLED_DMA_COPY_USER. (closes: #444271)
   * [arm] Mark BCM43XX as broken on ARM.
   * [mips/r4k-ip22] Disable EARLY PRINTK because it breaks serial console.
   * [mips] Add some IP22 fixes from Thomas Bogendoerfer:

Modified: dists/sid/linux-2.6/debian/config/arm/config.iop32x
==============================================================================
--- dists/sid/linux-2.6/debian/config/arm/config.iop32x (original)
+++ dists/sid/linux-2.6/debian/config/arm/config.iop32x Fri Nov 30 08:33:09 2007
@@ -1148,8 +1148,6 @@
 # DMA Clients
 #
 CONFIG_NET_DMA=y
-CONFIG_POLLED_DMA_COPY_USER=y
-CONFIG_POLLED_DMA_MEMCPY_THRESHOLD=768
 
 #
 # DMA Devices

Modified: dists/sid/linux-2.6/debian/patches/series/1
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/1 (original)
+++ dists/sid/linux-2.6/debian/patches/series/1 Fri Nov 30 08:33:09 2007
@@ -46,7 +46,6 @@
 + bugfix/arm/disable-video_bt848.patch
 + bugfix/arm/disable-bcm43xx.patch
 + bugfix/arm/binutils-notes.patch
-+ bugfix/arm/try-dma-copy-to-user.patch
 + bugfix/all/git-ieee1394.patch
 + features/all/v7-iwlwifi-add-iwlwifi-wireless-drivers.patch
 + features/all/e1000e-20070806.patch

_______________________________________________
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes

Reply via email to