diff --git a/kernel/kernel-rt/centos/meta_patches/Build-logic-and-sources-for-TiC.patch b/kernel/kernel-rt/centos/meta_patches/Build-logic-and-sources-for-TiC.patch index a6d85e32c..457842310 100644 --- a/kernel/kernel-rt/centos/meta_patches/Build-logic-and-sources-for-TiC.patch +++ b/kernel/kernel-rt/centos/meta_patches/Build-logic-and-sources-for-TiC.patch @@ -1,7 +1,7 @@ -From 779c7986900ecc5dcc736c46b80690df8626746b Mon Sep 17 00:00:00 2001 +From 4a2a30175a859e5a60b5a0e999c9edfde03eee7c Mon Sep 17 00:00:00 2001 From: Jim Somerville Date: Mon, 23 Apr 2018 15:18:45 -0400 -Subject: [PATCH 1/5] Build logic and sources for TiC +Subject: [PATCH] Build logic and sources for TiC Signed-off-by: Jim Somerville --- @@ -9,7 +9,7 @@ Signed-off-by: Jim Somerville 1 file changed, 272 insertions(+), 7 deletions(-) diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec -index dc814f7..4dc3361 100644 +index c05b910..dfbbe1f 100644 --- a/SPECS/kernel-rt.spec +++ b/SPECS/kernel-rt.spec @@ -17,23 +17,33 @@ Summary: The Linux Realtime kernel @@ -520,7 +520,7 @@ index dc814f7..4dc3361 100644 +%endif # do_sign + %changelog - * Mon Jun 18 2018 Luis Claudio R. Goncalves [3.10.0-862.6.3.rt56.811.el7] + * Fri Aug 10 2018 Luis Claudio R. Goncalves [3.10.0-862.11.6.rt56.819.el7] - [rt] Update source tree to match RHEL 7.5 tree [1549768 1462329] -- 2.7.4 diff --git a/kernel/kernel-rt/centos/meta_patches/Lower-the-compiler-version-requirement.patch b/kernel/kernel-rt/centos/meta_patches/Lower-the-compiler-version-requirement.patch deleted file mode 100644 index 404bf6160..000000000 --- a/kernel/kernel-rt/centos/meta_patches/Lower-the-compiler-version-requirement.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2266f2e97fc39650ad6afb55cae3b9e11a4d1021 Mon Sep 17 00:00:00 2001 -Message-Id: <2266f2e97fc39650ad6afb55cae3b9e11a4d1021.1528227675.git.Jim.Somerville@windriver.com> -In-Reply-To: -References: -From: Jim Somerville -Date: Tue, 29 May 2018 13:06:24 -0400 -Subject: [PATCH 3/3] Lower the compiler version requirement - -Signed-off-by: Jim Somerville ---- - SPECS/kernel-rt.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec -index 15114e6..ab6daf3 100644 ---- a/SPECS/kernel-rt.spec -+++ b/SPECS/kernel-rt.spec -@@ -296,7 +296,7 @@ Provides: kernel-rt-%{_target_cpu} = %{rpmversion}-%{pkg_release} - # - BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar - BuildRequires: xz, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk --BuildRequires: gcc >= 4.8.5-28, binutils >= 2.25, redhat-rpm-config >= 9.1.0-55 -+BuildRequires: gcc >= 4.8.5-16, binutils >= 2.25, redhat-rpm-config >= 9.1.0-55 - BuildRequires: hostname, net-tools, patchutils, bc - %if %{builddoc} - BuildRequires: xmlto, asciidoc --- -1.8.3.1 - diff --git a/kernel/kernel-rt/centos/meta_patches/Lower-the-linux-firmware-version-requirement.patch b/kernel/kernel-rt/centos/meta_patches/Lower-the-linux-firmware-version-requirement.patch deleted file mode 100644 index 400afe5c3..000000000 --- a/kernel/kernel-rt/centos/meta_patches/Lower-the-linux-firmware-version-requirement.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ab1bce8c119b1f99f5b22eba8f419854262744f6 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Jim Somerville -Date: Fri, 1 Jun 2018 16:17:43 -0400 -Subject: [PATCH 1/1] Lower the linux firmware version requirement - -Signed-off-by: Jim Somerville ---- - SPECS/kernel-rt.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec -index 3c0e4b4..e614b70 100644 ---- a/SPECS/kernel-rt.spec -+++ b/SPECS/kernel-rt.spec -@@ -259,7 +259,7 @@ Provides: kernel-modeset = 1\ - Provides: kernel-uname-r = %{KVERREL}%{?1:.%{1}}\ - Requires(pre): %{kernel_prereq}\ - Requires(pre): %{initrd_prereq}\ --Requires(pre): linux-firmware >= 20180113-61\ -+Requires(pre): linux-firmware >= 20170606-56\ - Requires(post): %{_sbindir}/new-kernel-pkg\ - Requires(post): system-release\ - Requires(preun): %{_sbindir}/new-kernel-pkg\ --- -1.8.3.1 - diff --git a/kernel/kernel-rt/centos/meta_patches/PATCH_ORDER b/kernel/kernel-rt/centos/meta_patches/PATCH_ORDER index 7a3ea4aae..8eab5dd84 100644 --- a/kernel/kernel-rt/centos/meta_patches/PATCH_ORDER +++ b/kernel/kernel-rt/centos/meta_patches/PATCH_ORDER @@ -1,5 +1,3 @@ Build-logic-and-sources-for-TiC.patch Kernel-source-patches-for-TiC.patch -Lower-the-compiler-version-requirement.patch Compile-issues.patch -Lower-the-linux-firmware-version-requirement.patch diff --git a/kernel/kernel-rt/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch b/kernel/kernel-rt/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch index 95aebf6d7..0ef0d1d7b 100644 --- a/kernel/kernel-rt/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch +++ b/kernel/kernel-rt/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch @@ -1,10 +1,7 @@ -From cb5a4baadb715440ce03e5e751f7125fc0d5427a Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From ef42dfab80cff26850695de8c95c3e1ba294e05c Mon Sep 17 00:00:00 2001 From: Alex Shi Date: Thu, 12 Jan 2017 21:27:03 +0800 -Subject: [PATCH 23/32] CPU / PM: expose pm_qos_resume_latency for CPUs +Subject: [PATCH] CPU / PM: expose pm_qos_resume_latency for CPUs [ commit 37efa4b41ffb31dcdfc3beb97d47992bb2a083e5 from linux-stable ] @@ -39,18 +36,18 @@ Signed-off-by: Jim Somerville 1 file changed, 2 insertions(+) diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c -index 803d2a0..1d9bba3 100644 +index 65e786d..91d620f 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c -@@ -15,6 +15,7 @@ - #include +@@ -16,6 +16,7 @@ #include #include + #include +#include #include "base.h" -@@ -318,6 +319,7 @@ int register_cpu(struct cpu *cpu, int num) +@@ -319,6 +320,7 @@ int register_cpu(struct cpu *cpu, int num) per_cpu(cpu_sys_devices, num) = &cpu->dev; if (!error) register_cpu_under_node(num, cpu_to_node(num)); @@ -59,5 +56,5 @@ index 803d2a0..1d9bba3 100644 #ifdef CONFIG_KEXEC if (!error) -- -1.8.3.1 +2.7.4 diff --git a/kernel/kernel-rt/centos/patches/Notification-of-death-of-arbitrary-processes.patch b/kernel/kernel-rt/centos/patches/Notification-of-death-of-arbitrary-processes.patch index fd0e17b77..fc36f39ed 100644 --- a/kernel/kernel-rt/centos/patches/Notification-of-death-of-arbitrary-processes.patch +++ b/kernel/kernel-rt/centos/patches/Notification-of-death-of-arbitrary-processes.patch @@ -1,10 +1,7 @@ -From 81c2c9a73d99e3df9c96daf65fec42997428af3e Mon Sep 17 00:00:00 2001 -Message-Id: <81c2c9a73d99e3df9c96daf65fec42997428af3e.1528226387.git.Jim.Somerville@windriver.com> -In-Reply-To: -References: +From 220edc1ccc6a0bc3dfb94a92946bf2b9a6cc0c61 Mon Sep 17 00:00:00 2001 From: Chris Friesen Date: Thu, 7 Apr 2016 11:16:19 -0600 -Subject: [PATCH 11/32] Notification of death of arbitrary processes +Subject: [PATCH] Notification of death of arbitrary processes Note: this commit was copied from Titanium Cloud Rel2 @@ -65,7 +62,7 @@ index d8c82e0..ba0c12e 100644 .timer_slack_ns = 50000, /* 50 usec default slack */ \ INIT_TIMER_LIST \ diff --git a/include/linux/sched.h b/include/linux/sched.h -index f8294d9..ab9c0f1 100644 +index 97ff026..0785453 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1664,6 +1664,12 @@ struct task_struct { @@ -82,7 +79,7 @@ index f8294d9..ab9c0f1 100644 int numa_scan_seq; unsigned int numa_scan_period; diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h -index 8ddaa82..53d6392 100644 +index a817b5c..2cf7776 100644 --- a/include/uapi/linux/prctl.h +++ b/include/uapi/linux/prctl.h @@ -55,6 +55,24 @@ @@ -457,7 +454,7 @@ index 8a908ea..448a3c3 100644 __exit_signal(p); diff --git a/kernel/fork.c b/kernel/fork.c -index c390b02..6340c77 100644 +index 6bda4c0..f3cd3ad 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1512,6 +1512,10 @@ static struct task_struct *copy_process(unsigned long clone_flags, @@ -472,10 +469,10 @@ index c390b02..6340c77 100644 /* Perform scheduler related setup. Assign this task to a CPU. */ retval = sched_fork(clone_flags, p); diff --git a/kernel/signal.c b/kernel/signal.c -index f1ecca9..daaa6ab 100644 +index 59e84a2..728daa9 100644 --- a/kernel/signal.c +++ b/kernel/signal.c -@@ -47,6 +47,9 @@ +@@ -48,6 +48,9 @@ #include #include #include "audit.h" /* audit_signal_info() */ @@ -485,7 +482,7 @@ index f1ecca9..daaa6ab 100644 /* * SLAB caches for signal bits. -@@ -1849,6 +1852,10 @@ bool do_notify_parent(struct task_struct *tsk, int sig) +@@ -1853,6 +1856,10 @@ bool do_notify_parent(struct task_struct *tsk, int sig) __wake_up_parent(tsk, tsk->parent); spin_unlock_irqrestore(&psig->siglock, flags); @@ -496,7 +493,7 @@ index f1ecca9..daaa6ab 100644 return autoreap; } -@@ -1920,6 +1927,10 @@ static void do_notify_parent_cldstop(struct task_struct *tsk, +@@ -1924,6 +1931,10 @@ static void do_notify_parent_cldstop(struct task_struct *tsk, */ __wake_up_parent(tsk, parent); spin_unlock_irqrestore(&sighand->siglock, flags); @@ -508,12 +505,12 @@ index f1ecca9..daaa6ab 100644 static inline int may_ptrace_stop(void) diff --git a/kernel/sys.c b/kernel/sys.c -index 9c2a4ed..54538e3 100644 +index e79ea7e..5d43b93 100644 --- a/kernel/sys.c +++ b/kernel/sys.c -@@ -64,6 +64,10 @@ - #include - #include +@@ -67,6 +67,10 @@ + /* Hardening for Spectre-v1 */ + #include +#ifdef CONFIG_SIGEXIT +#include "death_notify.h" @@ -522,7 +519,7 @@ index 9c2a4ed..54538e3 100644 #ifndef SET_UNALIGN_CTL # define SET_UNALIGN_CTL(a,b) (-EINVAL) #endif -@@ -2474,6 +2478,11 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, +@@ -2478,6 +2482,11 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, else error = PR_MCE_KILL_DEFAULT; break; @@ -535,5 +532,5 @@ index 9c2a4ed..54538e3 100644 error = prctl_set_mm(arg2, arg3, arg4, arg5); break; -- -1.8.3.1 +2.7.4 diff --git a/kernel/kernel-rt/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch b/kernel/kernel-rt/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch index 6b76290ac..e0025f635 100644 --- a/kernel/kernel-rt/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch +++ b/kernel/kernel-rt/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch @@ -1,10 +1,7 @@ -From 3b5212f6cf0d7746dd48324fa99030f49073ca8c Mon Sep 17 00:00:00 2001 -Message-Id: <3b5212f6cf0d7746dd48324fa99030f49073ca8c.1528226387.git.Jim.Somerville@windriver.com> -In-Reply-To: -References: +From 7c074369c609a20df6a4467bc2de59b8945ee326 Mon Sep 17 00:00:00 2001 From: Alex Kozyrev Date: Wed, 19 Jul 2017 02:21:59 -0500 -Subject: [PATCH 19/32] Porting Cacheinfo from Kernel 4.10.17 +Subject: [PATCH] Porting Cacheinfo from Kernel 4.10.17 Original source code from tag v4.10.17 in Linux stable tree for: intel_cacheinfo.c, cacheinfo.c and cacheinfo.h. @@ -61,7 +58,7 @@ Signed-off-by: Jim Somerville create mode 100644 include/linux/cacheinfo.h diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu -index 55338e6..eaf8da1 100644 +index ff65f15..7521be8 100644 --- a/Documentation/ABI/testing/sysfs-devices-system-cpu +++ b/Documentation/ABI/testing/sysfs-devices-system-cpu @@ -201,6 +201,71 @@ Description: address and size of the percpu note. @@ -1931,10 +1928,10 @@ index 0000000..eb3af27 +} +device_initcall(cacheinfo_sysfs_init); diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c -index bd82212..803d2a0 100644 +index 290609b..65e786d 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c -@@ -338,6 +338,60 @@ struct device *get_cpu_device(unsigned cpu) +@@ -340,6 +340,60 @@ struct device *get_cpu_device(unsigned cpu) } EXPORT_SYMBOL_GPL(get_cpu_device); @@ -2106,12 +2103,12 @@ index 0000000..6a524bf + +#endif /* _LINUX_CACHEINFO_H */ diff --git a/include/linux/cpu.h b/include/linux/cpu.h -index 80e2b1d..06f9893 100644 +index a5dd694..ceaa393 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h -@@ -43,6 +43,9 @@ extern ssize_t cpu_show_spectre_v1(struct device *dev, - extern ssize_t cpu_show_spectre_v2(struct device *dev, - struct device_attribute *attr, char *buf); +@@ -49,6 +49,9 @@ extern ssize_t cpu_show_spec_store_bypass(struct device *dev, + extern ssize_t cpu_show_l1tf(struct device *dev, + struct device_attribute *attr, char *buf); +extern struct device *cpu_device_create(struct device *parent, void *drvdata, + const struct attribute_group **groups, @@ -2120,5 +2117,5 @@ index 80e2b1d..06f9893 100644 extern void unregister_cpu(struct cpu *cpu); extern ssize_t arch_cpu_probe(const char *, size_t); -- -1.8.3.1 +2.7.4 diff --git a/kernel/kernel-rt/centos/srpm_path b/kernel/kernel-rt/centos/srpm_path index c5cf404d9..7250e62d6 100644 --- a/kernel/kernel-rt/centos/srpm_path +++ b/kernel/kernel-rt/centos/srpm_path @@ -1 +1 @@ -mirror:Source/kernel-rt-3.10.0-862.6.3.rt56.811.el7.src.rpm +mirror:Source/kernel-rt-3.10.0-862.11.6.rt56.819.el7.src.rpm