diff options
Diffstat (limited to 'sys-kernel/ck-sources/files')
| -rw-r--r-- | sys-kernel/ck-sources/files/ck-sources-2.6.10-drm-dos-fix.patch | 268 | ||||
| -rw-r--r-- | sys-kernel/ck-sources/files/ck-sources-2.6.11-74070.patch (renamed from sys-kernel/ck-sources/files/ck-sources-2.6.10-74070.patch) | 0 | ||||
| -rw-r--r-- | sys-kernel/ck-sources/files/ck-sources-81106.patch | 32 | ||||
| -rw-r--r-- | sys-kernel/ck-sources/files/digest-ck-sources-2.6.10-r6 | 2 | ||||
| -rw-r--r-- | sys-kernel/ck-sources/files/digest-ck-sources-2.6.11-r1 | 2 |
5 files changed, 2 insertions, 302 deletions
diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.10-drm-dos-fix.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.10-drm-dos-fix.patch deleted file mode 100644 index cd8d7af324c2..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-2.6.10-drm-dos-fix.patch +++ /dev/null @@ -1,268 +0,0 @@ -diff -ur linux-2.6.9/drivers/char/drm/i810_dma.c linux-2.6.9.drm.plasmaroo/drivers/char/drm/i810_dma.c ---- linux-2.6.9/drivers/char/drm/i810_dma.c 2004-10-18 22:53:46.000000000 +0100 -+++ linux-2.6.9.drm.plasmaroo/drivers/char/drm/i810_dma.c 2004-12-19 22:46:33.317446112 +0000 -@@ -1030,10 +1030,7 @@ - drm_file_t *priv = filp->private_data; - drm_device_t *dev = priv->dev; - -- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i810_flush_ioctl called without lock held\n"); -- return -EINVAL; -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - i810_flush_queue(dev); - return 0; -@@ -1055,10 +1052,7 @@ - if (copy_from_user(&vertex, (drm_i810_vertex_t __user *)arg, sizeof(vertex))) - return -EFAULT; - -- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i810_dma_vertex called without lock held\n"); -- return -EINVAL; -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - DRM_DEBUG("i810 dma vertex, idx %d used %d discard %d\n", - vertex.idx, vertex.used, vertex.discard); -@@ -1090,10 +1084,7 @@ - if (copy_from_user(&clear, (drm_i810_clear_t __user *)arg, sizeof(clear))) - return -EFAULT; - -- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i810_clear_bufs called without lock held\n"); -- return -EINVAL; -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - /* GH: Someone's doing nasty things... */ - if (!dev->dev_private) { -@@ -1114,10 +1105,8 @@ - - DRM_DEBUG("i810_swap_bufs\n"); - -- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i810_swap_buf called without lock held\n"); -- return -EINVAL; -- } -+ -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - i810_dma_dispatch_swap( dev ); - return 0; -@@ -1152,10 +1141,7 @@ - if (copy_from_user(&d, (drm_i810_dma_t __user *)arg, sizeof(d))) - return -EFAULT; - -- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i810_dma called without lock held\n"); -- return -EINVAL; -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - d.granted = 0; - -@@ -1266,10 +1252,7 @@ - return -EFAULT; - - -- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i810_dma_mc called without lock held\n"); -- return -EINVAL; -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - if (mc.idx >= dma->buf_count || mc.idx < 0) - return -EINVAL; -@@ -1317,10 +1300,7 @@ - drm_device_t *dev = priv->dev; - drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private; - -- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i810_fstatus called without lock held\n"); -- return -EINVAL; -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - return I810_READ(0x30008); - } - -@@ -1331,10 +1311,7 @@ - drm_device_t *dev = priv->dev; - drm_i810_private_t *dev_priv = (drm_i810_private_t *)dev->dev_private; - -- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i810_ov0_flip called without lock held\n"); -- return -EINVAL; -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - //Tell the overlay to update - I810_WRITE(0x30000,dev_priv->overlay_physical | 0x80000000); -@@ -1376,10 +1353,7 @@ - - DRM_DEBUG("%s\n", __FUNCTION__); - -- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i810_flip_buf called without lock held\n"); -- return -EINVAL; -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - if (!dev_priv->page_flipping) - i810_do_init_pageflip( dev ); -diff -ur linux-2.6.9/drivers/char/drm/i830_dma.c linux-2.6.9.drm.plasmaroo/drivers/char/drm/i830_dma.c ---- linux-2.6.9/drivers/char/drm/i830_dma.c 2004-10-18 22:53:12.000000000 +0100 -+++ linux-2.6.9.drm.plasmaroo/drivers/char/drm/i830_dma.c 2004-12-19 22:46:33.319445808 +0000 -@@ -1319,10 +1319,7 @@ - drm_file_t *priv = filp->private_data; - drm_device_t *dev = priv->dev; - -- if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i830_flush_ioctl called without lock held\n"); -- return -EINVAL; -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - i830_flush_queue(dev); - return 0; -@@ -1343,10 +1340,7 @@ - if (copy_from_user(&vertex, (drm_i830_vertex_t __user *)arg, sizeof(vertex))) - return -EFAULT; - -- if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i830_dma_vertex called without lock held\n"); -- return -EINVAL; -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - DRM_DEBUG("i830 dma vertex, idx %d used %d discard %d\n", - vertex.idx, vertex.used, vertex.discard); -@@ -1373,10 +1367,7 @@ - if (copy_from_user(&clear, (drm_i830_clear_t __user *)arg, sizeof(clear))) - return -EFAULT; - -- if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i830_clear_bufs called without lock held\n"); -- return -EINVAL; -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - /* GH: Someone's doing nasty things... */ - if (!dev->dev_private) { -@@ -1398,10 +1389,7 @@ - - DRM_DEBUG("i830_swap_bufs\n"); - -- if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i830_swap_buf called without lock held\n"); -- return -EINVAL; -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - i830_dma_dispatch_swap( dev ); - return 0; -@@ -1442,10 +1430,7 @@ - - DRM_DEBUG("%s\n", __FUNCTION__); - -- if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i830_flip_buf called without lock held\n"); -- return -EINVAL; -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - if (!dev_priv->page_flipping) - i830_do_init_pageflip( dev ); -@@ -1484,10 +1469,7 @@ - if (copy_from_user(&d, (drm_i830_dma_t __user *)arg, sizeof(d))) - return -EFAULT; - -- if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i830_dma called without lock held\n"); -- return -EINVAL; -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - d.granted = 0; - -diff -ur linux-2.6.9/drivers/char/drm/i830_irq.c linux-2.6.9.drm.plasmaroo/drivers/char/drm/i830_irq.c ---- linux-2.6.9/drivers/char/drm/i830_irq.c 2004-10-18 22:54:54.000000000 +0100 -+++ linux-2.6.9.drm.plasmaroo/drivers/char/drm/i830_irq.c 2004-12-19 22:46:33.320445656 +0000 -@@ -129,10 +129,7 @@ - drm_i830_irq_emit_t emit; - int result; - -- if(!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i830_irq_emit called without lock held\n"); -- return -EINVAL; -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - if ( !dev_priv ) { - DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ ); -diff -ur linux-2.6.9/drivers/char/drm/i915_dma.c linux-2.6.9.drm.plasmaroo/drivers/char/drm/i915_dma.c ---- linux-2.6.9/drivers/char/drm/i915_dma.c 2004-10-18 22:53:51.000000000 +0100 -+++ linux-2.6.9.drm.plasmaroo/drivers/char/drm/i915_dma.c 2004-12-19 22:46:33.321445504 +0000 -@@ -545,10 +545,7 @@ - { - DRM_DEVICE; - -- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i915_flush_ioctl called without lock held\n"); -- return DRM_ERR(EINVAL); -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - return i915_quiescent(dev); - } -@@ -574,10 +571,7 @@ - DRM_DEBUG("i915 batchbuffer, start %x used %d cliprects %d\n", - batch.start, batch.used, batch.num_cliprects); - -- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i915_batchbuffer called without lock held\n"); -- return DRM_ERR(EINVAL); -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - if (batch.num_cliprects && DRM_VERIFYAREA_READ(batch.cliprects, - batch.num_cliprects * -@@ -606,10 +600,7 @@ - DRM_DEBUG("i915 cmdbuffer, buf %p sz %d cliprects %d\n", - cmdbuf.buf, cmdbuf.sz, cmdbuf.num_cliprects); - -- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i915_cmdbuffer called without lock held\n"); -- return DRM_ERR(EINVAL); -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - if (cmdbuf.num_cliprects && - DRM_VERIFYAREA_READ(cmdbuf.cliprects, -@@ -645,10 +636,7 @@ - DRM_DEVICE; - - DRM_DEBUG("%s\n", __FUNCTION__); -- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i915_flip_buf called without lock held\n"); -- return DRM_ERR(EINVAL); -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - return i915_dispatch_flip(dev); - } -diff -ur linux-2.6.9/drivers/char/drm/i915_irq.c linux-2.6.9.drm.plasmaroo/drivers/char/drm/i915_irq.c ---- linux-2.6.9/drivers/char/drm/i915_irq.c 2004-10-18 22:53:51.000000000 +0100 -+++ linux-2.6.9.drm.plasmaroo/drivers/char/drm/i915_irq.c 2004-12-19 22:46:33.321445504 +0000 -@@ -92,10 +92,7 @@ - drm_i915_irq_emit_t emit; - int result; - -- if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { -- DRM_ERROR("i915_irq_emit called without lock held\n"); -- return DRM_ERR(EINVAL); -- } -+ LOCK_TEST_WITH_RETURN( dev, filp ); - - if (!dev_priv) { - DRM_ERROR("%s called with no initialization\n", __FUNCTION__); diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.10-74070.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.11-74070.patch index 3b4ee332f9e9..3b4ee332f9e9 100644 --- a/sys-kernel/ck-sources/files/ck-sources-2.6.10-74070.patch +++ b/sys-kernel/ck-sources/files/ck-sources-2.6.11-74070.patch diff --git a/sys-kernel/ck-sources/files/ck-sources-81106.patch b/sys-kernel/ck-sources/files/ck-sources-81106.patch deleted file mode 100644 index 44abcbca1ac0..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-81106.patch +++ /dev/null @@ -1,32 +0,0 @@ -# ChangeSet -# 2005/01/25 10:10:51+00:00 aia21@cantab.net -# NTFS: Add printk rate limiting for ntfs_warning() and ntfs_error() when -# compiled without debug. This avoids a possible denial of service -# attack. Thanks to Carl-Daniel Hailfinger from SuSE for pointing this -# out. -# -diff -Nru a/fs/ntfs/debug.c b/fs/ntfs/debug.c ---- a/fs/ntfs/debug.c 2005-02-15 12:38:26 -08:00 -+++ b/fs/ntfs/debug.c 2005-02-15 12:38:26 -08:00 -@@ -53,6 +53,10 @@ - va_list args; - int flen = 0; - -+#ifndef DEBUG -+ if (!printk_ratelimit()) -+ return; -+#endif - if (function) - flen = strlen(function); - spin_lock(&err_buf_lock); -@@ -93,6 +97,10 @@ - va_list args; - int flen = 0; - -+#ifndef DEBUG -+ if (!printk_ratelimit()) -+ return; -+#endif - if (function) - flen = strlen(function); - spin_lock(&err_buf_lock); diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.10-r6 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.10-r6 deleted file mode 100644 index 028ea1215ee0..000000000000 --- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.10-r6 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 cffcd2919d9c8ef793ce1ac07a440eda linux-2.6.10.tar.bz2 36533484 -MD5 42685e2911ba0f0f1df301b86f23810f patch-2.6.10-ck6.bz2 67095 diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11-r1 new file mode 100644 index 000000000000..e918c02547ea --- /dev/null +++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11-r1 @@ -0,0 +1,2 @@ +MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679 +MD5 83b1ffcd7a37522fab36913f85088169 patch-2.6.11-ck1.bz2 37569 |