From f6e042da02e76cc79b6acaf5b3a8a0704f8bc59a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Tue, 23 Dec 2014 03:18:50 -0200
Subject: linux-libre-grsec{,-knock}: the UDEREF PCID bug has been fixed

---
 kernels/linux-libre-grsec-knock/config.i686   |  5 +----
 kernels/linux-libre-grsec-knock/config.x86_64 |  5 +----
 kernels/linux-libre-grsec-knock/linux.install | 15 ++++++---------
 3 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'kernels/linux-libre-grsec-knock')

diff --git a/kernels/linux-libre-grsec-knock/config.i686 b/kernels/linux-libre-grsec-knock/config.i686
index 16a9e7c04..32ac7aa65 100644
--- a/kernels/linux-libre-grsec-knock/config.i686
+++ b/kernels/linux-libre-grsec-knock/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.17.1-gnu-201410192051-1-grsec-knock Kernel Configuration
+# Linux/x86 3.17.7-gnu-201412211910-1-grsec-knock Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -420,8 +420,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
@@ -5524,7 +5522,6 @@ CONFIG_RTC_DRV_DS1511=m
 CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1742=m
 CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_EFI=m
 CONFIG_RTC_DRV_STK17TA8=m
 CONFIG_RTC_DRV_M48T86=m
 CONFIG_RTC_DRV_M48T35=m
diff --git a/kernels/linux-libre-grsec-knock/config.x86_64 b/kernels/linux-libre-grsec-knock/config.x86_64
index a0bf84ae5..a0da84f1c 100644
--- a/kernels/linux-libre-grsec-knock/config.x86_64
+++ b/kernels/linux-libre-grsec-knock/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.17.1-gnu-201410192051-1-grsec-knock Kernel Configuration
+# Linux/x86 3.17.7-gnu-201412211910-1-grsec-knock Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -415,8 +415,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
@@ -5295,7 +5293,6 @@ CONFIG_RTC_DRV_DS1511=m
 CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1742=m
 CONFIG_RTC_DRV_DS2404=m
-CONFIG_RTC_DRV_EFI=m
 CONFIG_RTC_DRV_STK17TA8=m
 CONFIG_RTC_DRV_M48T86=m
 CONFIG_RTC_DRV_M48T35=m
diff --git a/kernels/linux-libre-grsec-knock/linux.install b/kernels/linux-libre-grsec-knock/linux.install
index 99069bc58..cee2a22fc 100644
--- a/kernels/linux-libre-grsec-knock/linux.install
+++ b/kernels/linux-libre-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.15.6_gnu.201407232200-2) -lt 0 ]]; then
-    _uderef_warning
+  if [[ $(vercmp $2 3.17.7_gnu.201412211910-1) -lt 0 ]]; then
+    _uderef_news
   fi
 }
 
-- 
cgit v1.2.3-2-g168b