[arch-commits] CVS update of core/base/kernel26 (PKGBUILD i915-oops.patch)

Tobias Powalowski tpowa at archlinux.org
Mon Oct 15 17:54:24 UTC 2007


    Date: Monday, October 15, 2007 @ 13:54:24
  Author: tpowa
    Path: /home/cvs-core/core/base/kernel26

   Added: i915-oops.patch (1.1)
Modified: PKGBUILD (1.264 -> 1.265)

'upgpkg: fixed drm issue'


-----------------+
 PKGBUILD        |   15 ++++++++-------
 i915-oops.patch |   24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 7 deletions(-)


Index: core/base/kernel26/PKGBUILD
diff -u core/base/kernel26/PKGBUILD:1.264 core/base/kernel26/PKGBUILD:1.265
--- core/base/kernel26/PKGBUILD:1.264	Sat Oct 13 04:52:08 2007
+++ core/base/kernel26/PKGBUILD	Mon Oct 15 13:54:24 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.264 2007/10/13 08:52:08 tpowa Exp $
+# $Id: PKGBUILD,v 1.265 2007/10/15 17:54:24 tpowa Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 # Maintainer: Thomas Baechler <thomas at archlinux.org>
 pkgname=kernel26
 _basekernel=2.6.23
 pkgver=2.6.23.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The Linux Kernel and modules"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -41,7 +41,8 @@
 	squashfs3.2-patch.bz2
 	http://download.filesystems.org/unionfs/unionfs-2.1/unionfs-2.1.6_for_2.6.23-rc8.diff.gz
 	adjust_current_level_to_closest_available.patch
-	hibernate-saa7134.diff)
+	hibernate-saa7134.diff
+	i915-oops.patch)
 md5sums=('2cc2fd4d521dc5d7cfce0d8a9d1b3472'
          '896c5d4e7fd68d37b8c16e5d2842563b'
          '20a13c215aa5ff1625835dd963848aba'
@@ -61,7 +62,8 @@
          '2b1921ac36a6ec84aaf62f8a90e0052d'
          '5bdaef7b9e38f24e370ea0001e9fa578'
          '5b40baab7fcd10d244308f9d1afda75c'
-         '19d8ed2579c18627ed4de1fd037a6652')
+         '19d8ed2579c18627ed4de1fd037a6652'
+         'a94660bbe1d5986a030a7af922fce72c')
 
 build() {
   [ "${CARCH}" = "i686" ]   && KARCH=i386
@@ -92,6 +94,8 @@
   patch -Np1 -i ../adjust_current_level_to_closest_available.patch || return 1
    # fix hibernate on saa7134
   patch -Np0 -i ../hibernate-saa7134.diff || return 1
+  # fix i915 oops
+  patch -Np1 -i ../i915-oops.patch || return 1
   # add sqashfs
   patch -Np1 -i ../squashfs3.2-patch || return 1
   # add unionfs
@@ -187,9 +191,6 @@
   find $startdir/pkg/usr/src/linux-${_kernver} -type d -exec chmod 755 {} \;
   cd $startdir/pkg/lib/modules/${_kernver} && \
     (rm -f source build; ln -sf ../../../usr/src/linux-${_kernver} build)
-  # for binary modules make prepare, not needed anymore in .22 kernels
-  # cd $startdir/pkg/lib/modules/${_kernver}/build
-  # make prepare
   # install fallback mkinitcpio.conf file and preset file for kernel
   install -m644 -D $startdir/src/${pkgname}.preset $startdir/pkg/etc/mkinitcpio.d/${pkgname}.preset || return 1
   install -m644 -D $startdir/src/mkinitcpio-$pkgname.conf $startdir/pkg/etc/mkinitcpio.d/$pkgname-fallback.conf || return 1
Index: core/base/kernel26/i915-oops.patch
diff -u /dev/null core/base/kernel26/i915-oops.patch:1.1
--- /dev/null	Mon Oct 15 13:54:24 2007
+++ core/base/kernel26/i915-oops.patch	Mon Oct 15 13:54:24 2007
@@ -0,0 +1,24 @@
+From 7c63ae4527355d8f52dc285a9163a5947a61572e Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Sun, 14 Oct 2007 21:21:30 +1000
+Subject: [PATCH] i915: fix vbl swap allocation size.
+
+Oops...
+
+Signed-off-by: Dave Airlie <airlied at linux.ie>
+---
+ drivers/char/drm/i915_irq.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
+index bb8e9e9..94d638e 100644
+--- a/drivers/char/drm/i915_irq.c
++++ b/drivers/char/drm/i915_irq.c
+@@ -553,7 +553,7 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
+ 		return DRM_ERR(EBUSY);
+ 	}
+ 
+-	vbl_swap = drm_calloc(1, sizeof(vbl_swap), DRM_MEM_DRIVER);
++	vbl_swap = drm_calloc(1, sizeof(*vbl_swap), DRM_MEM_DRIVER);
+ 
+ 	if (!vbl_swap) {
+ 		DRM_ERROR("Failed to allocate memory to queue swap\n"); 




More information about the arch-commits mailing list