From 0433d6b21a4aaa67ac537a3884a4edb489e70018 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 12 Feb 2020 06:38:00 +0100 Subject: [PATCH] linux5.5: update to 5.5.3. - Disable CONFIG_DRM_LEGACY and related modules. Those are pre-i686 from +20 years ago... - Switch to CONFIG_PREEMPT_VOLUNTARY to make zfs build again. See #18940 --- srcpkgs/linux5.5/files/i386-dotconfig | 33 ++++++++++++----------- srcpkgs/linux5.5/files/x86_64-dotconfig | 36 ++++++++++++------------- srcpkgs/linux5.5/template | 6 ++--- 3 files changed, 37 insertions(+), 38 deletions(-) diff --git a/srcpkgs/linux5.5/files/i386-dotconfig b/srcpkgs/linux5.5/files/i386-dotconfig index 42288ea4e1e..e85fce41e94 100644 --- a/srcpkgs/linux5.5/files/i386-dotconfig +++ b/srcpkgs/linux5.5/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 5.5.2 Kernel Configuration +# Linux/i386 5.5.3 Kernel Configuration # # @@ -92,10 +92,8 @@ CONFIG_HIGH_RES_TIMERS=y # end of Timers subsystem # CONFIG_PREEMPT_NONE is not set -# CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y -CONFIG_PREEMPT_COUNT=y -CONFIG_PREEMPTION=y +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set # # CPU/Task time and stats accounting @@ -118,7 +116,7 @@ CONFIG_CPU_ISOLATION=y # # RCU Subsystem # -CONFIG_PREEMPT_RCU=y +CONFIG_TREE_RCU=y # CONFIG_RCU_EXPERT is not set CONFIG_SRCU=y CONFIG_TREE_SRCU=y @@ -875,7 +873,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=y -CONFIG_UNINLINE_SPIN_UNLOCK=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_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_RWSEM_SPIN_ON_OWNER=y @@ -5728,13 +5730,14 @@ CONFIG_TINYDRM_REPAPER=m CONFIG_TINYDRM_ST7586=m # CONFIG_TINYDRM_ST7735R is not set CONFIG_DRM_VBOXVIDEO=m -CONFIG_DRM_LEGACY=y -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_MGA=m -CONFIG_DRM_SIS=m -CONFIG_DRM_VIA=m -CONFIG_DRM_SAVAGE=m +# CONFIG_DRM_LEGACY is not set +# CONFIG_DRM_TDFX is not set +# CONFIG_DRM_R128 is not set +# CONFIG_DRM_I810 is not set +# CONFIG_DRM_MGA is not set +# CONFIG_DRM_SIS is not set +# CONFIG_DRM_VIA is not set +# CONFIG_DRM_SAVAGE is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # @@ -9341,7 +9344,6 @@ CONFIG_SCHEDSTATS=y # end of Scheduler Debugging # CONFIG_DEBUG_TIMEKEEPING is not set -# CONFIG_DEBUG_PREEMPT is not set # # Lock Debugging (spinlocks, mutexes, etc...) @@ -9416,7 +9418,6 @@ CONFIG_FUNCTION_TRACER=y CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_PREEMPTIRQ_EVENTS is not set # CONFIG_IRQSOFF_TRACER is not set -# CONFIG_PREEMPT_TRACER is not set # CONFIG_SCHED_TRACER is not set # CONFIG_HWLAT_TRACER is not set CONFIG_FTRACE_SYSCALLS=y diff --git a/srcpkgs/linux5.5/files/x86_64-dotconfig b/srcpkgs/linux5.5/files/x86_64-dotconfig index 998a79a97dd..e7c5af00d58 100644 --- a/srcpkgs/linux5.5/files/x86_64-dotconfig +++ b/srcpkgs/linux5.5/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.5.2 Kernel Configuration +# Linux/x86_64 5.5.3 Kernel Configuration # # @@ -94,10 +94,8 @@ CONFIG_HIGH_RES_TIMERS=y # end of Timers subsystem # CONFIG_PREEMPT_NONE is not set -# CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y -CONFIG_PREEMPT_COUNT=y -CONFIG_PREEMPTION=y +CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT is not set # # CPU/Task time and stats accounting @@ -121,7 +119,7 @@ CONFIG_CPU_ISOLATION=y # # RCU Subsystem # -CONFIG_PREEMPT_RCU=y +CONFIG_TREE_RCU=y # CONFIG_RCU_EXPERT is not set CONFIG_SRCU=y CONFIG_TREE_SRCU=y @@ -899,7 +897,11 @@ CONFIG_BFQ_GROUP_IOSCHED=y CONFIG_PREEMPT_NOTIFIERS=y CONFIG_PADATA=y CONFIG_ASN1=y -CONFIG_UNINLINE_SPIN_UNLOCK=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_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_RWSEM_SPIN_ON_OWNER=y @@ -4843,7 +4845,6 @@ CONFIG_REGULATOR_TPS6524X=m # CONFIG_REGULATOR_WM831X is not set CONFIG_CEC_CORE=y CONFIG_CEC_NOTIFIER=y -CONFIG_CEC_PIN=y CONFIG_RC_CORE=m CONFIG_RC_MAP=m CONFIG_LIRC=y @@ -4890,7 +4891,6 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y CONFIG_MEDIA_RADIO_SUPPORT=y # CONFIG_MEDIA_SDR_SUPPORT is not set CONFIG_MEDIA_CEC_SUPPORT=y -CONFIG_CEC_PIN_ERROR_INJ=y CONFIG_MEDIA_CONTROLLER=y CONFIG_MEDIA_CONTROLLER_DVB=y # CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set @@ -5168,7 +5168,6 @@ CONFIG_VIDEO_SH_VEU=m CONFIG_DVB_PLATFORM_DRIVERS=y CONFIG_CEC_PLATFORM_DRIVERS=y CONFIG_VIDEO_CROS_EC_CEC=m -CONFIG_CEC_GPIO=m CONFIG_VIDEO_SECO_CEC=m CONFIG_VIDEO_SECO_RC=y @@ -5785,13 +5784,14 @@ CONFIG_TINYDRM_ST7586=m # CONFIG_TINYDRM_ST7735R is not set # CONFIG_DRM_XEN is not set CONFIG_DRM_VBOXVIDEO=m -CONFIG_DRM_LEGACY=y -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_MGA=m -CONFIG_DRM_SIS=m -CONFIG_DRM_VIA=m -CONFIG_DRM_SAVAGE=m +# CONFIG_DRM_LEGACY is not set +# CONFIG_DRM_TDFX is not set +# CONFIG_DRM_R128 is not set +# CONFIG_DRM_I810 is not set +# CONFIG_DRM_MGA is not set +# CONFIG_DRM_SIS is not set +# CONFIG_DRM_VIA is not set +# CONFIG_DRM_SAVAGE is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y # @@ -9517,7 +9517,6 @@ CONFIG_SCHEDSTATS=y # end of Scheduler Debugging # CONFIG_DEBUG_TIMEKEEPING is not set -# CONFIG_DEBUG_PREEMPT is not set # # Lock Debugging (spinlocks, mutexes, etc...) @@ -9592,7 +9591,6 @@ CONFIG_FUNCTION_TRACER=y CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_PREEMPTIRQ_EVENTS is not set # CONFIG_IRQSOFF_TRACER is not set -# CONFIG_PREEMPT_TRACER is not set # CONFIG_SCHED_TRACER is not set # CONFIG_HWLAT_TRACER is not set CONFIG_FTRACE_SYSCALLS=y diff --git a/srcpkgs/linux5.5/template b/srcpkgs/linux5.5/template index f98d038b146..d21fa1230db 100644 --- a/srcpkgs/linux5.5/template +++ b/srcpkgs/linux5.5/template @@ -1,14 +1,14 @@ # Template file for 'linux5.5' pkgname=linux5.5 -version=5.5.2 -revision=2 +version=5.5.3 +revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Juan RP " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=24f5f383b0337374f160723bcf3bf679c75cb5bd3fd0824a56998e47c04ef99e +checksum=2bef3edcf44c746383045f4a809b2013e18c52319c827875ed8e89138951cab2 patch_args="-Np1" # XXX restrict archs until all archs are updated.