From 1caa35ab9baae8cfe2f52628b092fb577e4dbc2c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Dec 2017 17:26:04 +0100
Subject: [PATCH] linux-tools: update to 4.14.5.

---
 srcpkgs/linux-tools/patches/cpuid-i686.patch | 76 --------------------
 srcpkgs/linux-tools/template                 |  6 +-
 2 files changed, 3 insertions(+), 79 deletions(-)
 delete mode 100644 srcpkgs/linux-tools/patches/cpuid-i686.patch

diff --git a/srcpkgs/linux-tools/patches/cpuid-i686.patch b/srcpkgs/linux-tools/patches/cpuid-i686.patch
deleted file mode 100644
index e02564b97e1..00000000000
--- a/srcpkgs/linux-tools/patches/cpuid-i686.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-https://patchwork.kernel.org/patch/2165061/
-
---- tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
-+++ tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c
-@@ -130,20 +130,48 @@ void cmdline(int argc, char **argv)
- 	}
- }
- 
-+static inline void cpuid(unsigned int info, unsigned int *eax,
-+			 unsigned int *ebx, unsigned int *ecx,
-+			 unsigned int *edx)
-+{
-+#if defined(__i386__) || defined(__x86_64__)
-+	unsigned int _eax = info, _ebx, _ecx, _edx;
-+	asm volatile (
-+# ifdef __i386__
-+		      "xchg %%ebx, %%esi;" /* save ebx (for PIC) */
-+		      "cpuid;"
-+		      "xchg %%esi, %%ebx;" /* restore ebx & pass to caller */
-+		      : "=S" (_ebx),
-+#else
-+		      "cpuid;"
-+		      : "=b" (_ebx),
-+#endif
-+			"+a" (_eax), "=c" (_ecx), "=d" (_edx)
-+		      : /* inputs: eax is handled above */
-+	);
-+	if (eax)
-+		*eax = _eax;
-+	if (ebx)
-+		*ebx = _ebx;
-+	if (ecx)
-+		*ecx = _ecx;
-+	if (edx)
-+		*edx = _edx;
-+#endif
-+}
-+
- /*
-  * validate_cpuid()
-  * returns on success, quietly exits on failure (make verbose with -v)
-  */
- void validate_cpuid(void)
- {
--	unsigned int eax, ebx, ecx, edx, max_level;
-+	unsigned int ebx, ecx, edx, max_level;
- 	unsigned int fms, family, model, stepping;
- 
--	eax = ebx = ecx = edx = 0;
--
--	asm("cpuid" : "=a" (max_level), "=b" (ebx), "=c" (ecx),
--		"=d" (edx) : "a" (0));
-+	ebx = ecx = edx = 0;
- 
-+	cpuid(0, &max_level, &ebx, &ecx, &edx);
- 	if (ebx != 0x756e6547 || edx != 0x49656e69 || ecx != 0x6c65746e) {
- 		if (verbose)
- 			fprintf(stderr, "%.4s%.4s%.4s != GenuineIntel",
-@@ -151,7 +179,7 @@ void validate_cpuid(void)
- 		exit(1);
- 	}
- 
--	asm("cpuid" : "=a" (fms), "=c" (ecx), "=d" (edx) : "a" (1) : "ebx");
-+	cpuid(1, &fms, NULL, NULL, &edx);
- 	family = (fms >> 8) & 0xf;
- 	model = (fms >> 4) & 0xf;
- 	stepping = fms & 0xf;
-@@ -173,7 +201,7 @@ void validate_cpuid(void)
- 	 * Support for MSR_IA32_ENERGY_PERF_BIAS
- 	 * is indicated by CPUID.06H.ECX.bit3
- 	 */
--	asm("cpuid" : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) : "a" (6));
-+	cpuid(6, NULL, NULL, &ecx, NULL);
- 	if (verbose)
- 		printf("CPUID.06H.ECX: 0x%x\n", ecx);
- 	if (!(ecx & (1 << 3))) {
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index a779a87630c..90368431407 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-tools'
 pkgname=linux-tools
-version=4.12
-revision=2
+version=4.14.5
+revision=1
 build_style=meta
 wrksrc="linux-${version}"
 short_desc="Linux kernel tools meta-pkg"
@@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
 homepage="https://www.kernel.org"
 distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz"
-checksum=a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab
+checksum=d589a3bc033499d53d4ff2caae83ee6fd2b9c794c8c7632ae42b656d202975da
 
 subpackages="cpupower libcpupower libcpupower-devel libusbip libusbip-devel usbip perf freefall tmon"