From b990bc1ad15fdd1b5bf4831bf086ab0b448a1a55 Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Fri, 27 Apr 2018 15:44:47 -0300
Subject: update linux-libre{-xtreme} config.armv7h

plus some other changes in linux-libre-xtreme's PKGBUILD

Signed-off-by: David P <megver83@parabola.nu>
---
 kernels/linux-libre-xtreme/PKGBUILD      |  8 ++++----
 kernels/linux-libre-xtreme/config.armv7h | 17 ++++++++---------
 2 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'kernels/linux-libre-xtreme')

diff --git a/kernels/linux-libre-xtreme/PKGBUILD b/kernels/linux-libre-xtreme/PKGBUILD
index 06bc51232..03f0ddcf9 100644
--- a/kernels/linux-libre-xtreme/PKGBUILD
+++ b/kernels/linux-libre-xtreme/PKGBUILD
@@ -86,7 +86,7 @@ sha512sums=('c6805b3649cd71cfef272384958b33da23a00908e795592470bf711dd67886ab7d7
             'SKIP'
             '7dda87dba2fcbc506298558e485d5653f4320bdab029ff1f42a5f483020a3fd18bc774cfd29d490eeb7afa9018da59aa333cbb9514715adf23023f417767502a'
             '560d8b866ca9ebd3f30b395e521ea57115f2aa5c5f7bb522a7b92d5d3d1c2c054bd5dc02afb2f55f8478cf6dfe8a78f78a2f12b08033a79f3621696edf028820'
-            '5691a197d2477182c675649d0c3816e479f39794cf55db498370cdfec9e38e849cafa18c86e1e03f95aaa8cbb553ace7335897af3fff032ed7171f53603ab4f8'
+            '4d2861fccf770bd1132563913bb580d3b15d864f58ec97d000b599c1c11a8c8715170672ad289a400895fbc57402d806b16113c40f0d3c84201bc5feb9f6fbcd'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
@@ -183,8 +183,8 @@ prepare() {
   patch -p1 -i ../0002-fix-Atmel-maXTouch-touchscreen-support.patch
 
   if [ "${CARCH}" = "x86_64" ]; then
-  # add hardened patches
-  patch -Np1 -i ../linux-hardened-${_pkgver%-*}.${_hardenedver}.patch
+  # linux-hardened patch
+  patch -p1 -i ../linux-hardened-${_pkgver%-*}.${_hardenedver}.patch
 
   # set CONSOLE_LOGLEVEL_MOTORMOUTH to 1
   # https://labs.parabola.nu/issues/1754
@@ -230,7 +230,7 @@ build() {
 }
 
 _package() {
-  pkgdesc="The ${pkgbase^} kernel and modules with a handful of awesome security features [AppArmor, SMACK, TOMOYO, SELinux, YAMA, Linux-hardened]"
+  pkgdesc="The ${pkgbase^} kernel and modules with a handful of security features [AppArmor, SMACK, TOMOYO, SELinux, YAMA, Linux-hardened]"
   [ ! "${CARCH}" = x86_64 ] && pkgdesc=${pkgdesc/, Linux-hardened}
   [ "${pkgbase}" = "linux-libre" ] && groups=('base' 'base-openrc')
   depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7')
diff --git a/kernels/linux-libre-xtreme/config.armv7h b/kernels/linux-libre-xtreme/config.armv7h
index 5378020d8..f2771da52 100644
--- a/kernels/linux-libre-xtreme/config.armv7h
+++ b/kernels/linux-libre-xtreme/config.armv7h
@@ -111,11 +111,11 @@ CONFIG_CPU_ISOLATION=y
 #
 # RCU Subsystem
 #
-CONFIG_TREE_RCU=y
+CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_EXPERT is not set
 CONFIG_SRCU=y
 CONFIG_TREE_SRCU=y
-# CONFIG_TASKS_RCU is not set
+CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_NEED_SEGCBLIST=y
 CONFIG_BUILD_BIN2C=y
@@ -373,11 +373,7 @@ CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
 CONFIG_PADATA=y
 CONFIG_ASN1=y
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
@@ -787,8 +783,9 @@ CONFIG_HOTPLUG_CPU=y
 CONFIG_ARM_PSCI=y
 CONFIG_ARCH_NR_GPIO=2048
 # CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
 CONFIG_HZ_FIXED=0
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_200 is not set
@@ -4983,6 +4980,7 @@ CONFIG_DVB_PLATFORM_DRIVERS=y
 CONFIG_DVB_C8SECTPFE=m
 CONFIG_CEC_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_MESON_AO_CEC=m
+CONFIG_CEC_GPIO=m
 CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
 CONFIG_VIDEO_TEGRA_HDMI_CEC=m
 # CONFIG_SDR_PLATFORM_DRIVERS is not set
@@ -8418,6 +8416,7 @@ CONFIG_SCHED_INFO=y
 CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_STACK_END_CHECK=y
 # CONFIG_DEBUG_TIMEKEEPING is not set
+CONFIG_DEBUG_PREEMPT=y
 
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
-- 
cgit v1.2.2