diff --git a/97731241f5f2acc4081c57cb3e8a56cde5732a55.patch b/97731241f5f2acc4081c57cb3e8a56cde5732a55.patch new file mode 100644 index 0000000000000000000000000000000000000000..428c86e7e2d4dc86fdb88590cea78d442e194ead --- /dev/null +++ b/97731241f5f2acc4081c57cb3e8a56cde5732a55.patch @@ -0,0 +1,37 @@ +diff --git a/cputree.c b/cputree.c +index 80a6d9d..eed20db 100644 +--- a/cputree.c ++++ b/cputree.c +@@ -112,9 +112,6 @@ static void setup_banned_cpus(void) + cpumask_t isolated_cpus; + char *env = NULL; + +- cpus_clear(isolated_cpus); +- cpus_clear(nohz_full); +- + /* A manually specified cpumask overrides auto-detection. */ + if (cpu_ban_string != NULL && banned_cpumask_from_ui != NULL) { + cpulist_parse(banned_cpumask_from_ui, +@@ -133,6 +130,9 @@ static void setup_banned_cpus(void) + goto out; + } + ++ cpus_clear(isolated_cpus); ++ cpus_clear(nohz_full); ++ + path = "/sys/devices/system/cpu/isolated"; + process_one_line(path, get_mask_from_cpulist, &isolated_cpus); + +@@ -141,11 +141,11 @@ static void setup_banned_cpus(void) + + cpus_or(banned_cpus, nohz_full, isolated_cpus); + +-out: + cpumask_scnprintf(buffer, 4096, isolated_cpus); + log(TO_CONSOLE, LOG_INFO, "Isolated CPUs: %s\n", buffer); + cpumask_scnprintf(buffer, 4096, nohz_full); + log(TO_CONSOLE, LOG_INFO, "Adaptive-ticks CPUs: %s\n", buffer); ++out: + cpumask_scnprintf(buffer, 4096, banned_cpus); + log(TO_CONSOLE, LOG_INFO, "Banned CPUs: %s\n", buffer); + } diff --git a/irqbalance.spec b/irqbalance.spec index 4a14689bd18770de97248d632d5bb8e53d97a1be..9384b8cebea788d902bd320dbe8c99437e65b8c2 100644 --- a/irqbalance.spec +++ b/irqbalance.spec @@ -1,12 +1,13 @@ Summary: A dynamic adaptive IRQ balancing daemon Name: irqbalance Version: 1.7.0 -Release: 1 +Release: 2 Epoch: 3 License: GPLv2 Source0: https://github.com/Irqbalance/irqbalance/archive/irqbalance-%{version}.tar.gz Source1: irqbalance.service Source2: irq_balancer +Patch6000: 97731241f5f2acc4081c57cb3e8a56cde5732a55.patch Url: https://github.com/irqbalance/irqbalance BuildRequires: gdb autoconf automake libtool libcap-ng systemd @@ -77,6 +78,9 @@ fi /sbin/chkconfig --del %{name} >/dev/null 2>&1 || : %changelog +* 20201121113007680463 patch-tracking 1.7.0-2 +- append patch file of upstream repository from <97731241f5f2acc4081c57cb3e8a56cde5732a55> to <97731241f5f2acc4081c57cb3e8a56cde5732a55> + * Fri Aug 14 2020 Liu Chao - 3:1.7.0-1 - Type:enhanced - ID:NA @@ -194,4 +198,3 @@ fi * Thu Aug 29 2019 caomeng - 3:1.4.0-2 - Package init -