[packages/kernel/LINUX_3_0] up to 3.0.52

glen glen at pld-linux.org
Mon Nov 26 15:29:21 CET 2012


commit 7265d024f585190907c58d5f3c6ae1dd1cbc6f30
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Nov 26 16:29:05 2012 +0200

    up to 3.0.52

 kernel-grsec_full.patch | 15 +++++++++------
 kernel.spec             |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index ab87d39..1ba8e01 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -93,7 +93,7 @@
 %endif
 
 %define		basever		3.0
-%define		postver		.51
+%define		postver		.52
 %define		rel		1
 
 %define		_enable_debug_packages			0
@@ -140,7 +140,7 @@ Source0:	http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5:	ecf932280e2441bdd992423ef3d55f8f
 %if "%{postver}" != ".0"
 Patch0:		http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5:	16abcd55ab1f44d7025bf6b872c1adf7
+# Patch0-md5:	a137b283cff5267442642c173b1c4bb7
 %endif
 
 Source3:	kernel-autoconf.h
diff --git a/kernel-grsec_full.patch b/kernel-grsec_full.patch
index 62760cb..b20ec83 100644
--- a/kernel-grsec_full.patch
+++ b/kernel-grsec_full.patch
@@ -26371,9 +26371,8 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_drv.c linux-3.0.9/drivers/gpu/drm/drm
  	++file_priv->ioctl_count;
  
  	DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-diff -urNp linux-3.0.9/drivers/gpu/drm/drm_fops.c linux-3.0.9/drivers/gpu/drm/drm_fops.c
---- linux-3.0.9/drivers/gpu/drm/drm_fops.c	2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/drivers/gpu/drm/drm_fops.c	2011-11-15 20:02:59.000000000 -0500
+--- kernel-3.0.52/drivers/gpu/drm/drm_fops.c~	2012-11-25 20:39:13.000000000 +0200
++++ kernel-3.0.52/drivers/gpu/drm/drm_fops.c	2012-11-25 20:43:10.258775214 +0200
 @@ -70,7 +70,7 @@ static int drm_setup(struct drm_device *
  	}
  
@@ -26383,15 +26382,19 @@ diff -urNp linux-3.0.9/drivers/gpu/drm/drm_fops.c linux-3.0.9/drivers/gpu/drm/dr
  
  	dev->sigdata.lock = NULL;
  
-@@ -134,8 +134,8 @@ int drm_open(struct inode *inode, struct
+@@ -134,11 +134,11 @@
  
  	retcode = drm_open_helper(inode, filp, dev);
  	if (!retcode) {
 -		atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
--		if (!dev->open_count++)
+-		if (!dev->open_count++) {
 +		atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
-+		if (local_inc_return(&dev->open_count) == 1)
++		if (local_inc_return(&dev->open_count) == 1) {
  			retcode = drm_setup(dev);
+ 			if (retcode)
+-				dev->open_count--;
++				local_dec(&dev->open_count);
+ 		}
  	}
  	if (!retcode) {
 @@ -472,7 +472,7 @@ int drm_release(struct inode *inode, str
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/7265d024f585190907c58d5f3c6ae1dd1cbc6f30



More information about the pld-cvs-commit mailing list