[linux] 03/03: cpupower: check for CPU existence has been fixed upstream, although a bit differently than the included patch.

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

corsac pushed a commit to branch stretch
in repository linux.

commit c36a7519639d664a1496355e36f6adeb06c967a7
Author: Yves-Alexis Perez <corsac at corsac.net>
Date:   Sun Feb 4 12:39:52 2018 +0100

    cpupower: check for CPU existence has been fixed upstream, although a bit differently than the included patch.
---
 debian/changelog                                   |  2 +
 .../cpupower-fix-checks-for-cpu-existence.patch    | 45 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 330f715..58a9be6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -898,6 +898,8 @@ linux (4.9.80-1) UNRELEASED; urgency=medium
     - refresh for fuzz (228)
   * mm: Avoid ABI change in 4.9.79.
   * usbip: ignore ABI change in 4.9.79.
+  * cpupower: check for CPU existence has been fixed upstream, although a bit
+    differently than the included patch.
 
   [ Salvatore Bonaccorso ]
   * nfsd: auth: Fix gid sorting when rootsquash enabled (CVE-2018-1000028)
diff --git a/debian/patches/bugfix/all/cpupower-fix-checks-for-cpu-existence.patch b/debian/patches/bugfix/all/cpupower-fix-checks-for-cpu-existence.patch
deleted file mode 100644
index be5f528..0000000
--- a/debian/patches/bugfix/all/cpupower-fix-checks-for-cpu-existence.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Ben Hutchings <ben at decadent.org.uk>
-Date: Thu, 03 Nov 2016 15:25:26 -0600
-Subject: cpupower: Fix checks for CPU existence
-Forwarded: https://marc.info/?l=linux-pm&m=149248268214265
-
-Calls to cpufreq_cpu_exists(cpu) were converted to
-cpupower_is_cpu_online(cpu) when libcpupower was introduced and the
-former function was deleted.  However, cpupower_is_cpu_online()
-returns 1 on success whereas cpufreq_cpu_exists() returned 0 on
-success.  It also does not distinguish physically absent and offline
-CPUs, and does not set errno.
-
-cpufreq-set has already been fixed (commit c25badc9ceb6).
-
-In cpufreq-bench, which prints an error message for offline CPUs,
-properly distinguish and report the zero and negative cases.
-
-Fixes: ac5a181d065d ("cpupower: Add cpuidle parts into library")
-Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
----
---- a/tools/power/cpupower/bench/system.c
-+++ b/tools/power/cpupower/bench/system.c
-@@ -58,12 +58,19 @@ long long int get_time()
- 
- int set_cpufreq_governor(char *governor, unsigned int cpu)
- {
-+	int rc;
- 
- 	dprintf("set %s as cpufreq governor\n", governor);
- 
--	if (cpupower_is_cpu_online(cpu) != 0) {
--		perror("cpufreq_cpu_exists");
--		fprintf(stderr, "error: cpu %u does not exist\n", cpu);
-+	rc = cpupower_is_cpu_online(cpu);
-+	if (rc != 1) {
-+		if (rc < 0)
-+			fprintf(stderr, "cpupower_is_cpu_online: %s\n",
-+				strerror(-rc));
-+		else
-+			fprintf(stderr,
-+				"error: cpu %u is offline or does not exist\n",
-+				cpu);
- 		return -1;
- 	}
- 
diff --git a/debian/patches/series b/debian/patches/series
index 71e7432..2cc07e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -162,7 +162,6 @@ bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch
 bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch
 bugfix/all/tools-lib-traceevent-fix-use-of-uninitialized-variables.patch
 bugfix/all/cpupower-bump-soname-version.patch
-bugfix/all/cpupower-fix-checks-for-cpu-existence.patch
 bugfix/all/liblockdep-fix-undefined-symbol-prandom_u32.patch
 bugfix/all/liblockdep-define-the-array_size-macro.patch
 bugfix/all/liblockdep-enable-wall-by-default.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git