From 70a40c8aa62daae8e312435835317e9a63f0f287 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Tue, 23 Dec 2014 03:20:48 -0200
Subject: linux-libre-lts-grsec{,-knock}: the UDEREF PCID bug has been fixed

---
 kernels/linux-libre-lts-grsec-knock/PKGBUILD      |  4 ++--
 kernels/linux-libre-lts-grsec-knock/config.i686   |  4 +---
 kernels/linux-libre-lts-grsec-knock/config.x86_64 |  4 +---
 kernels/linux-libre-lts-grsec-knock/linux.install | 15 ++++++---------
 kernels/linux-libre-lts-grsec/PKGBUILD            |  4 ++--
 kernels/linux-libre-lts-grsec/config.i686         |  4 +---
 kernels/linux-libre-lts-grsec/config.x86_64       |  4 +---
 kernels/linux-libre-lts-grsec/linux.install       | 15 ++++++---------
 8 files changed, 20 insertions(+), 34 deletions(-)

(limited to 'kernels')

diff --git a/kernels/linux-libre-lts-grsec-knock/PKGBUILD b/kernels/linux-libre-lts-grsec-knock/PKGBUILD
index f139c2522..b6d674b80 100644
--- a/kernels/linux-libre-lts-grsec-knock/PKGBUILD
+++ b/kernels/linux-libre-lts-grsec-knock/PKGBUILD
@@ -59,8 +59,8 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             'SKIP'
             '70cbe962aa01989ffa83490bb0765d6e4c781f6133dc8d768d84bd6716ac0209'
             'SKIP'
-            '421bd0710d0fb9b16f53eb20a298bed5fc10e47697e14d566126afc8827e17bb'
-            '49d90ee3713ebd017e4f2c82f558a337f404b316b28a74ff586c384783b234f2'
+            '30cbb772d4ef6562cb761149c82213db2844e9ab853ddfb1936d76446f54df0b'
+            '545babe1eb6b6bb5dc8b7d4692bc6ca8a4166debb9d680875268925932231f56'
             '4b029accfd05ea03b337a278a39e217dfd6aba1d934ed350e61724b1af53b65d'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264'
diff --git a/kernels/linux-libre-lts-grsec-knock/config.i686 b/kernels/linux-libre-lts-grsec-knock/config.i686
index fdb5914cc..768b8fc9b 100644
--- a/kernels/linux-libre-lts-grsec-knock/config.i686
+++ b/kernels/linux-libre-lts-grsec-knock/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.19-gnu-201409180900-1-lts-grsec-knock Kernel Configuration
+# Linux/x86 3.14.27-gnu-201412211908-1-lts-grsec-knock Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -411,8 +411,6 @@ CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_VM86=y
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX32=y
 CONFIG_TOSHIBA=m
 CONFIG_I8K=m
 CONFIG_X86_REBOOTFIXUPS=y
diff --git a/kernels/linux-libre-lts-grsec-knock/config.x86_64 b/kernels/linux-libre-lts-grsec-knock/config.x86_64
index 8652fb6a3..dbfb5fe70 100644
--- a/kernels/linux-libre-lts-grsec-knock/config.x86_64
+++ b/kernels/linux-libre-lts-grsec-knock/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.19-gnu-201409180900-1-lts-grsec-knock Kernel Configuration
+# Linux/x86 3.14.27-gnu-201412211908-1-lts-grsec-knock Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -403,8 +403,6 @@ CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX64=y
 CONFIG_I8K=m
 CONFIG_MICROCODE=m
 # CONFIG_MICROCODE_INTEL is not set
diff --git a/kernels/linux-libre-lts-grsec-knock/linux.install b/kernels/linux-libre-lts-grsec-knock/linux.install
index 19b161976..cdd4fc784 100644
--- a/kernels/linux-libre-lts-grsec-knock/linux.install
+++ b/kernels/linux-libre-lts-grsec-knock/linux.install
@@ -4,13 +4,12 @@
 KERNEL_NAME=
 KERNEL_VERSION=
 
-_uderef_warning() {
+_uderef_news() {
   if [[ $(uname -m) = x86_64 ]]; then
     cat <<EOF
-CONFIG_PAX_MEMORY_UDEREF is now enabled on x86_64 and can be disabled by
-passing \`pax_nouderef\` on the kernel line. UDEREF's PCID support on Sandy
-Bridge and later is known to have issues with recent kernel versions and can be
-disabled by passing \`nopcid\` to use the legacy implementation.
+The UDEREF PCID bug has been fixed. If you added \`nopcid\` or \`pax_nouderef\`
+to the kernel line as a workaround it should now be removed to take advantage
+of the stronger PCID-based UDEREF implementation.
 EOF
   fi
 }
@@ -21,8 +20,6 @@ post_install () {
   depmod ${KERNEL_VERSION}
   echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
   mkinitcpio -p linux-libre${KERNEL_NAME}
-
-  _uderef_warning
 }
 
 post_upgrade() {
@@ -46,8 +43,8 @@ post_upgrade() {
     echo ">>>          include the 'keyboard' hook in your mkinitcpio.conf."
   fi
 
-  if [[ $(vercmp $2 3.14.18_gnu.201409082127-2) -lt 0 ]]; then
-    _uderef_warning
+  if [[ $(vercmp $2 3.14.27_gnu.201412211908-1) -lt 0 ]]; then
+    _uderef_news
   fi
 }
 
diff --git a/kernels/linux-libre-lts-grsec/PKGBUILD b/kernels/linux-libre-lts-grsec/PKGBUILD
index d5a6f0913..cce747fd4 100644
--- a/kernels/linux-libre-lts-grsec/PKGBUILD
+++ b/kernels/linux-libre-lts-grsec/PKGBUILD
@@ -54,8 +54,8 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             'SKIP'
             '6a54cf72bf2d0231f6c1e13eda0585919178e66312270522d91a9c34c32643f7'
             'SKIP'
-            'b579108a60b56edccdf99fd3873cc49fbe174be239a5f69d50082d26cb9d3053'
-            'ca675995cacff121facf54cf84077c1238b47731f3f7dd637d6c9d12161c765f'
+            '064ba6595f578bb09175508df8f8d824d6db9afc828f59b8e50f3f17063a134b'
+            'd7c0c0431e7b81d95b5239ae285b48a58fa3c9ae1fd87d990cdeb44fb27e0b3d'
             'c0b6569a6c29fe8fae4a2079902bf4a508ea59836599e89aa3d8629caead631b'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264'
diff --git a/kernels/linux-libre-lts-grsec/config.i686 b/kernels/linux-libre-lts-grsec/config.i686
index 33a0cd20a..2b2837738 100644
--- a/kernels/linux-libre-lts-grsec/config.i686
+++ b/kernels/linux-libre-lts-grsec/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.19-gnu-201409180900-1-lts-grsec Kernel Configuration
+# Linux/x86 3.14.27-gnu-201412211908-1-lts-grsec Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -411,8 +411,6 @@ CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_VM86=y
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX32=y
 CONFIG_TOSHIBA=m
 CONFIG_I8K=m
 CONFIG_X86_REBOOTFIXUPS=y
diff --git a/kernels/linux-libre-lts-grsec/config.x86_64 b/kernels/linux-libre-lts-grsec/config.x86_64
index b7f38aa49..69c3d619d 100644
--- a/kernels/linux-libre-lts-grsec/config.x86_64
+++ b/kernels/linux-libre-lts-grsec/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.19-gnu-201409180900-1-lts-grsec Kernel Configuration
+# Linux/x86 3.14.27-gnu-201412211908-1-lts-grsec Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -403,8 +403,6 @@ CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_THRESHOLD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX64=y
 CONFIG_I8K=m
 CONFIG_MICROCODE=m
 # CONFIG_MICROCODE_INTEL is not set
diff --git a/kernels/linux-libre-lts-grsec/linux.install b/kernels/linux-libre-lts-grsec/linux.install
index 19b161976..cdd4fc784 100644
--- a/kernels/linux-libre-lts-grsec/linux.install
+++ b/kernels/linux-libre-lts-grsec/linux.install
@@ -4,13 +4,12 @@
 KERNEL_NAME=
 KERNEL_VERSION=
 
-_uderef_warning() {
+_uderef_news() {
   if [[ $(uname -m) = x86_64 ]]; then
     cat <<EOF
-CONFIG_PAX_MEMORY_UDEREF is now enabled on x86_64 and can be disabled by
-passing \`pax_nouderef\` on the kernel line. UDEREF's PCID support on Sandy
-Bridge and later is known to have issues with recent kernel versions and can be
-disabled by passing \`nopcid\` to use the legacy implementation.
+The UDEREF PCID bug has been fixed. If you added \`nopcid\` or \`pax_nouderef\`
+to the kernel line as a workaround it should now be removed to take advantage
+of the stronger PCID-based UDEREF implementation.
 EOF
   fi
 }
@@ -21,8 +20,6 @@ post_install () {
   depmod ${KERNEL_VERSION}
   echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
   mkinitcpio -p linux-libre${KERNEL_NAME}
-
-  _uderef_warning
 }
 
 post_upgrade() {
@@ -46,8 +43,8 @@ post_upgrade() {
     echo ">>>          include the 'keyboard' hook in your mkinitcpio.conf."
   fi
 
-  if [[ $(vercmp $2 3.14.18_gnu.201409082127-2) -lt 0 ]]; then
-    _uderef_warning
+  if [[ $(vercmp $2 3.14.27_gnu.201412211908-1) -lt 0 ]]; then
+    _uderef_news
   fi
 }
 
-- 
cgit v1.2.3