diff --git a/debian/arch/defines b/debian/arch/defines index a760616bd..1473bf09c 100644 --- a/debian/arch/defines +++ b/debian/arch/defines @@ -1,5 +1,5 @@ [abi] -abiname: 2 +abiname: 1 [base] arches: diff --git a/debian/arch/sparc/defines b/debian/arch/sparc/defines index d63e9ff36..ff6936f66 100644 --- a/debian/arch/sparc/defines +++ b/debian/arch/sparc/defines @@ -1,5 +1,4 @@ [base] -compiler: gcc-4.1 flavours: sparc32 sparc64 diff --git a/debian/changelog b/debian/changelog index 3f6a414c5..8a9ceeabe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,3 @@ -linux-2.6 (2.6.17-2) UNRELEASED; urgency=low - - [ Jurij Smakov ] - * [sparc] Switch to gcc-4.1, as it produces the working kernel, while - gcc-4.0 does not. Bump ABI to 2 as a result. - * [sparc32] Add sparc32-iotlb.patch to fix DMA errors on sparc32. - - -- Jurij Smakov Sat, 24 Jun 2006 08:42:46 -0700 - linux-2.6 (2.6.17-1) unstable; urgency=low [ Frederik Schüler ] diff --git a/debian/patches/series/1 b/debian/patches/series/1 index 28ecb3571..7128c35c0 100644 --- a/debian/patches/series/1 +++ b/debian/patches/series/1 @@ -22,4 +22,3 @@ + s390-drivers-ccw-uevent-cleanup.patch + mips-sb1-duart-tts.patch + 2.6.17.1 -+ sparc32-iotlb.patch diff --git a/debian/patches/sparc32-iotlb.patch b/debian/patches/sparc32-iotlb.patch deleted file mode 100644 index 5c546a8f3..000000000 --- a/debian/patches/sparc32-iotlb.patch +++ /dev/null @@ -1,37 +0,0 @@ -From breuerr@mc.net Mon Jun 19 21:10:41 2006 -Date: Mon, 19 Jun 2006 23:08:59 -0500 -From: Bob Breuer -To: sparclinux@vger.kernel.org -Subject: [PATCH] sparc32: fix iommu_flush_iotlb end address - -Fix the calculation of the end address when flushing iotlb entries to -ram. This bug has been a cause of esp dma errors, and it affects -HyperSPARC systems much worse than SuperSPARC systems. - -Signed-off-by: Bob Breuer ---- - -Just in case it's not obvious from the patch as to how the dma was -broken: Each dma mapping sets up iopte entries for the iommu, and the -iommu only looks in main memory for the iopte entries. If there is a -group of iopte entries that are smaller than a page in size, but -straddle a page boundary, the broken code would fail to flush the last -page to ram. - -Bob - -diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c -index 77840c8..7215849 100644 ---- a/arch/sparc/mm/iommu.c -+++ b/arch/sparc/mm/iommu.c -@@ -144,8 +144,9 @@ static void iommu_flush_iotlb(iopte_t *i - unsigned long start; - unsigned long end; - -- start = (unsigned long)iopte & PAGE_MASK; -+ start = (unsigned long)iopte; - end = PAGE_ALIGN(start + niopte*sizeof(iopte_t)); -+ start &= PAGE_MASK; - if (viking_mxcc_present) { - while(start < end) { - viking_mxcc_flush_page(start);