[arch-commits] Commit in linux-grsec/trunk (4 files)
Daniel Micay
thestinger at archlinux.org
Wed Jan 28 09:28:22 UTC 2015
Date: Wednesday, January 28, 2015 @ 10:28:21
Author: thestinger
Revision: 126687
upgpkg: linux-grsec 3.18.4.201501272307-1
Modified:
linux-grsec/trunk/PKGBUILD
linux-grsec/trunk/config
linux-grsec/trunk/config.x86_64
Deleted:
linux-grsec/trunk/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch
-----------------------------------------------------------------+
0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch | 79 ----------
PKGBUILD | 19 --
config | 3
config.x86_64 | 3
4 files changed, 11 insertions(+), 93 deletions(-)
Deleted: 0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch
===================================================================
--- 0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch 2015-01-28 09:13:17 UTC (rev 126686)
+++ 0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch 2015-01-28 09:28:21 UTC (rev 126687)
@@ -1,79 +0,0 @@
-From d472fcc8379c062bd56a3876fc6ef22258f14a91 Mon Sep 17 00:00:00 2001
-From: Daniel Vetter <daniel.vetter at ffwll.ch>
-Date: Mon, 24 Nov 2014 11:12:42 +0100
-Subject: [PATCH] drm/i915: Disallow pin ioctl completely for kms drivers
-
-The problem here is that SNA pins batchbuffers to etch out a bit more
-performance. Iirc it started out as a w/a for i830M (which we've
-implemented in the kernel since a long time already). The problem is
-that the pin ioctl wasn't added in
-
-commit d23db88c3ab233daed18709e3a24d6c95344117f
-Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Fri May 23 08:48:08 2014 +0200
-
- drm/i915: Prevent negative relocation deltas from wrapping
-
-Fix this by simply disallowing pinning from userspace so that the
-kernel is in full control of batch placement again. Especially since
-distros are moving towards running X as non-root, so most users won't
-even be able to see any benefits.
-
-UMS support is dead now, but we need this minimal patch for
-backporting. Follow-up patch will remove the pin ioctl code
-completely.
-
-Note to backporters: You must have both
-
-commit b45305fce5bb1abec263fcff9d81ebecd6306ede
-Author: Daniel Vetter <daniel.vetter at ffwll.ch>
-Date: Mon Dec 17 16:21:27 2012 +0100
-
- drm/i915: Implement workaround for broken CS tlb on i830/845
-
-which laned in 3.8 and
-
-commit c4d69da167fa967749aeb70bc0e94a457e5d00c1
-Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Mon Sep 8 14:25:41 2014 +0100
-
- drm/i915: Evict CS TLBs between batches
-
-which is also marked cc: stable. Otherwise this could introduce a
-regression by disabling the userspace w/a without the kernel w/a being
-fully functional on i830/45.
-
-References: https://bugs.freedesktop.org/show_bug.cgi?id=76554#c116
-Cc: stable at vger.kernel.org # requires c4d69da167fa967749a and v3.8
-Cc: Chris Wilson <chris at chris-wilson.co.uk>
-Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
----
- drivers/gpu/drm/i915/i915_gem.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
-index fd17cca..97b86a5 100644
---- a/drivers/gpu/drm/i915/i915_gem.c
-+++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -4263,7 +4263,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data,
- struct drm_i915_gem_object *obj;
- int ret;
-
-- if (INTEL_INFO(dev)->gen >= 6)
-+ if (drm_core_check_feature(dev, DRIVER_MODESET))
- return -ENODEV;
-
- ret = i915_mutex_lock_interruptible(dev);
-@@ -4319,6 +4319,9 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data,
- struct drm_i915_gem_object *obj;
- int ret;
-
-+ if (drm_core_check_feature(dev, DRIVER_MODESET))
-+ return -ENODEV;
-+
- ret = i915_mutex_lock_interruptible(dev);
- if (ret)
- return ret;
---
-2.2.0
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-01-28 09:13:17 UTC (rev 126686)
+++ PKGBUILD 2015-01-28 09:28:21 UTC (rev 126687)
@@ -7,9 +7,9 @@
pkgbase=linux-grsec
_srcname=linux-3.18
-_pkgver=3.18.3
+_pkgver=3.18.4
_grsecver=3.0
-_timestamp=201501211944
+_timestamp=201501272307
_grsec_patch="grsecurity-$_grsecver-$_pkgver-$_timestamp.patch"
pkgver=$_pkgver.$_timestamp
pkgrel=1
@@ -29,19 +29,17 @@
# standard config files for mkinitcpio ramdisk
'linux.preset'
'change-default-console-loglevel.patch'
- '0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch'
)
sha256sums=('becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd'
'SKIP'
- '564eed0dfd7aadeec97566da6d09f8636b6335882139cf6d42e45381276bb2d0'
+ '57c74ba5266bb10be335a89d30480739b3de67b5a72b3e0b0d37a27775b1862a'
'SKIP'
- '3b32e99637e05ddf98100a8e290fcbb67e689eb5405515c837541062e848df8b'
+ '655d998d6436c84e630696a94f9f53d0036fed82d5ff02119db2ab9e37db835f'
'SKIP'
- '3730ac2c05934cdfa5f82001c3815b7ea307de2b57f38b4871fd1f73bb3bb0df'
- '8962b42de4526ce7252b51825fd9a9f2518d799b057650a4bbe3fb9cf05977d9'
+ 'ef622b478483a26357fef6a1b32a1681cbbc07af5e780dab9138fe643e01e2e5'
+ 'd4b167b2aa3a76d88cedfe712ac36b30508088881a562d962a8b48a872c81502'
'ca7e718375b3790888756cc0a64a7500cd57dddb9bf7e10a0df22c860d91f74d'
- '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
- '0bda45a3ef0f2780bbe588f2e53ab2b79814d29e9c6fc7bfff3b0dbdaa9e710d')
+ '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
@@ -59,9 +57,6 @@
# add latest fixes from stable queue, if needed
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
- # fix #43143
- patch -p1 -i "${srcdir}/0001-drm-i915-Disallow-pin-ioctl-completely-for-kms-drive.patch"
-
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
# remove this when a Kconfig knob is made available by upstream
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
Modified: config
===================================================================
--- config 2015-01-28 09:13:17 UTC (rev 126686)
+++ config 2015-01-28 09:28:21 UTC (rev 126687)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.18.1.201412281149-1 Kernel Configuration
+# Linux/x86 3.18.4.201501272307-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -7013,6 +7013,7 @@
CONFIG_GRKERNSEC_CHROOT_FINDTASK=y
CONFIG_GRKERNSEC_CHROOT_NICE=y
CONFIG_GRKERNSEC_CHROOT_SYSCTL=y
+CONFIG_GRKERNSEC_CHROOT_RENAME=y
CONFIG_GRKERNSEC_CHROOT_CAPS=y
CONFIG_GRKERNSEC_CHROOT_INITRD=y
Modified: config.x86_64
===================================================================
--- config.x86_64 2015-01-28 09:13:17 UTC (rev 126686)
+++ config.x86_64 2015-01-28 09:28:21 UTC (rev 126687)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.18.1.201412281149-1 Kernel Configuration
+# Linux/x86 3.18.4.201501272307-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -6710,6 +6710,7 @@
CONFIG_GRKERNSEC_CHROOT_FINDTASK=y
CONFIG_GRKERNSEC_CHROOT_NICE=y
CONFIG_GRKERNSEC_CHROOT_SYSCTL=y
+CONFIG_GRKERNSEC_CHROOT_RENAME=y
CONFIG_GRKERNSEC_CHROOT_CAPS=y
CONFIG_GRKERNSEC_CHROOT_INITRD=y
More information about the arch-commits
mailing list