kernel26-libre-lts-2.6.32.29-2

6 files changed, 61 insertions, 6 deletions

diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre-testing/kernel26-libre-lts/PKGBUILD
index ce42a6b02..964e94eb2 100644
--- a/libre/kernel26-libre-lts/PKGBUILD
+++ b/libre-testing/kernel26-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102710 2010-12-10 14:54:46Z andyrtr $
+# $Id$
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 
@@ -7,11 +7,12 @@ pkgname=('kernel26-libre-lts' 'kernel26-libre-lts-headers') # Build stock -lts k
 _kernelname=${pkgname#kernel26-libre}
 _basekernel=2.6.32
 pkgver=${_basekernel}.29
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://linux-libre.fsfla.org"
 source=(http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/${pkgver}-libre2/linux-${pkgver}-libre2.tar.bz2
+        libata-alignment.patch
 	# the main kernel config files
         config.i686 config.x86_64
         # standard config files for mkinitcpio ramdisk
@@ -21,6 +22,9 @@ source=(http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/${pkg
 build() {
   cd ${srcdir}/linux-$pkgver
 
+  # fix 22343 udev crashes
+  patch -Np1 -i ${srcdir}/libata-alignment.patch
+
   cat ../config.$CARCH >./.config
 
   if [ "${_kernelname}" != "" ]; then
@@ -88,6 +92,8 @@ package_kernel26-libre-lts() {
   rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build}
   # remove the firmware
   rm -rf ${pkgdir}/lib/firmware
+  # gzip -9 all modules to safe 100MB of space
+  find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
 }
 
 package_kernel26-libre-lts-headers() {
@@ -206,7 +212,8 @@ package_kernel26-libre-lts-headers() {
   rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 }
 md5sums=('56f1879c2e12421882826aad8b6d9210'
-         '5812d5d96c84c519cea01ce138f3596a'
-         '361a9bf920ae7d5ecaf96095ecdada0e'
+         '30851deee235a7486bd408cbe8eb2d71'
+         '5b4fcd892ee4baf9db8fc9b8aa66a741'
+         '4741e988cce00d77a02424ae4286bcb0'
          '2cbfeb3e2a18d45f82f613e97fc23355'
          'fbfc7a1af3208c7b729055d91e1c149a')
diff --git a/libre/kernel26-libre-lts/config.i686 b/libre-testing/kernel26-libre-lts/config.i686
index 8df34f5b8..0a14c46f3 100644
--- a/libre/kernel26-libre-lts/config.i686
+++ b/libre-testing/kernel26-libre-lts/config.i686
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Fri Feb 18 17:24:33 2011
+# Sat Feb 19 16:39:33 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre-testing/kernel26-libre-lts/config.x86_64
index a8dc519b1..92b878704 100644
--- a/libre/kernel26-libre-lts/config.x86_64
+++ b/libre-testing/kernel26-libre-lts/config.x86_64
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32
-# Fri Feb 18 17:12:22 2011
+# Sat Feb 19 17:17:30 2011
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
diff --git a/libre/kernel26-libre-lts/kernel26-libre-lts.install b/libre-testing/kernel26-libre-lts/kernel26-libre-lts.install
index c3249445a..c3249445a 100644
--- a/libre/kernel26-libre-lts/kernel26-libre-lts.install
+++ b/libre-testing/kernel26-libre-lts/kernel26-libre-lts.install
diff --git a/libre/kernel26-libre-lts/kernel26-libre-lts.preset b/libre-testing/kernel26-libre-lts/kernel26-libre-lts.preset
index b65e064b4..b65e064b4 100644
--- a/libre/kernel26-libre-lts/kernel26-libre-lts.preset
+++ b/libre-testing/kernel26-libre-lts/kernel26-libre-lts.preset
diff --git a/libre-testing/kernel26-libre-lts/libata-alignment.patch b/libre-testing/kernel26-libre-lts/libata-alignment.patch
new file mode 100644
index 000000000..edd96f3b1
--- /dev/null
+++ b/libre-testing/kernel26-libre-lts/libata-alignment.patch
@@ -0,0 +1,48 @@
+diff -Nur linux-2.6.32.orig/drivers/ata/libata-scsi.c linux-2.6.32/drivers/ata/libata-scsi.c
+--- linux-2.6.32.orig/drivers/ata/libata-scsi.c	2009-12-03 14:51:21.000000000 +1100
++++ linux-2.6.32/drivers/ata/libata-scsi.c	2011-01-22 20:32:53.353775375 +1100
+@@ -1099,13 +1099,13 @@
+ 	/* configure max sectors */
+ 	blk_queue_max_sectors(sdev->request_queue, dev->max_sectors);
+ 
++	sdev->sector_size = ATA_SECT_SIZE;
++
+ 	if (dev->class == ATA_DEV_ATAPI) {
+ 		struct request_queue *q = sdev->request_queue;
+ 		void *buf;
+ 
+-		/* set the min alignment and padding */
+-		blk_queue_update_dma_alignment(sdev->request_queue,
+-					       ATA_DMA_PAD_SZ - 1);
++		/* set DMA padding */
+ 		blk_queue_update_dma_pad(sdev->request_queue,
+ 					 ATA_DMA_PAD_SZ - 1);
+ 
+@@ -1119,12 +1119,24 @@
+ 
+ 		blk_queue_dma_drain(q, atapi_drain_needed, buf, ATAPI_MAX_DRAIN);
+ 	} else {
+-		/* ATA devices must be sector aligned */
+-		blk_queue_update_dma_alignment(sdev->request_queue,
+-					       ATA_SECT_SIZE - 1);
+ 		sdev->manage_start_stop = 1;
+ 	}
+ 
++	/*
++	 * ata_pio_sectors() expects buffer for each sector to not cross
++	 * page boundary.  Enforce it by requiring buffers to be sector
++	 * aligned, which works iff sector_size is not larger than
++	 * PAGE_SIZE.  ATAPI devices also need the alignment as
++	 * IDENTIFY_PACKET is executed as ATA_PROT_PIO.
++	 */
++	if (sdev->sector_size > PAGE_SIZE)
++		ata_dev_printk(dev, KERN_WARNING,
++			"sector_size=%u > PAGE_SIZE, PIO may malfunction\n",
++			sdev->sector_size);
++
++	blk_queue_update_dma_alignment(sdev->request_queue,
++				       sdev->sector_size - 1);
++
+ 	if (dev->flags & ATA_DFLAG_AN)
+ 		set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events);
+