diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-11 17:48:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-11 17:48:06 +0100 |
| commit | c33a1a38677da898d44226dd30bfe23f74bc8585 (patch) | |
| tree | 906cb75ab0f3942f74b8f5223b718384462318e3 | |
| parent | baa351b5b90862669fea1a8f2edf8ee8bc4b2b9b (diff) | |
sys-kernel/linux-{image,headers} : add revert for https://github.com/torvalds/linux/commit/5209654a46ee71137ad9b06da99d4ef2794475af (See : https://community.amd.com/thread/224000)
4 files changed, 60 insertions, 0 deletions
diff --git a/sys-kernel/linux-headers/files/0001-Revert-x86-ACPI-cstate-Allow-ACPI-C1-FFH-MWAIT-use-o.patch b/sys-kernel/linux-headers/files/0001-Revert-x86-ACPI-cstate-Allow-ACPI-C1-FFH-MWAIT-use-o.patch new file mode 100644 index 00000000..e8f3bfda --- /dev/null +++ b/sys-kernel/linux-headers/files/0001-Revert-x86-ACPI-cstate-Allow-ACPI-C1-FFH-MWAIT-use-o.patch @@ -0,0 +1,29 @@ +From f912ead404ffa24db7f4aee527aff411db39262a Mon Sep 17 00:00:00 2001 +From: Gabriel Craciunescu <crazy@frugalware.org> +Date: Wed, 11 Apr 2018 17:17:06 +0200 +Subject: [PATCH] Revert "x86/ACPI/cstate: Allow ACPI C1 FFH MWAIT use on AMD systems" + +This reverts commit 5209654a46ee71137ad9b06da99d4ef2794475af. +Please see: https://community.amd.com/thread/224000 + +--- + arch/x86/kernel/acpi/cstate.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c +index dde437f5d14f..8233a630280f 100644 +--- a/arch/x86/kernel/acpi/cstate.c ++++ b/arch/x86/kernel/acpi/cstate.c +@@ -167,8 +167,7 @@ static int __init ffh_cstate_init(void) + { + struct cpuinfo_x86 *c = &boot_cpu_data; + +- if (c->x86_vendor != X86_VENDOR_INTEL && +- c->x86_vendor != X86_VENDOR_AMD) ++ if (c->x86_vendor != X86_VENDOR_INTEL) + return -1; + + cpu_cstate_entry = alloc_percpu(struct cstate_entry); +-- +2.17.0 + diff --git a/sys-kernel/linux-headers/linux-headers-4.16.1.ebuild b/sys-kernel/linux-headers/linux-headers-4.16.1.ebuild index c92379f2..5c4582e9 100644 --- a/sys-kernel/linux-headers/linux-headers-4.16.1.ebuild +++ b/sys-kernel/linux-headers/linux-headers-4.16.1.ebuild @@ -28,6 +28,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/enable_alx_wol.patch "${FILESDIR}"/0001-Revert-ath10k-activate-user-space-firmware-loading-a.patch "${FILESDIR}"/0001-Revert-swiotlb-remove-various-exports.patch + "${FILESDIR}"/0001-Revert-x86-ACPI-cstate-Allow-ACPI-C1-FFH-MWAIT-use-o.patch "${FILESDIR}"/mute-pps_state_mismatch.patch "${FILESDIR}"/drop_ancient-and-wrong-msg.patch "${FILESDIR}"/uksm-4.16.patch ) diff --git a/sys-kernel/linux-image/files/0001-Revert-x86-ACPI-cstate-Allow-ACPI-C1-FFH-MWAIT-use-o.patch b/sys-kernel/linux-image/files/0001-Revert-x86-ACPI-cstate-Allow-ACPI-C1-FFH-MWAIT-use-o.patch new file mode 100644 index 00000000..e8f3bfda --- /dev/null +++ b/sys-kernel/linux-image/files/0001-Revert-x86-ACPI-cstate-Allow-ACPI-C1-FFH-MWAIT-use-o.patch @@ -0,0 +1,29 @@ +From f912ead404ffa24db7f4aee527aff411db39262a Mon Sep 17 00:00:00 2001 +From: Gabriel Craciunescu <crazy@frugalware.org> +Date: Wed, 11 Apr 2018 17:17:06 +0200 +Subject: [PATCH] Revert "x86/ACPI/cstate: Allow ACPI C1 FFH MWAIT use on AMD systems" + +This reverts commit 5209654a46ee71137ad9b06da99d4ef2794475af. +Please see: https://community.amd.com/thread/224000 + +--- + arch/x86/kernel/acpi/cstate.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c +index dde437f5d14f..8233a630280f 100644 +--- a/arch/x86/kernel/acpi/cstate.c ++++ b/arch/x86/kernel/acpi/cstate.c +@@ -167,8 +167,7 @@ static int __init ffh_cstate_init(void) + { + struct cpuinfo_x86 *c = &boot_cpu_data; + +- if (c->x86_vendor != X86_VENDOR_INTEL && +- c->x86_vendor != X86_VENDOR_AMD) ++ if (c->x86_vendor != X86_VENDOR_INTEL) + return -1; + + cpu_cstate_entry = alloc_percpu(struct cstate_entry); +-- +2.17.0 + diff --git a/sys-kernel/linux-image/linux-image-4.16.1.ebuild b/sys-kernel/linux-image/linux-image-4.16.1.ebuild index 954dcfd8..0a05656c 100644 --- a/sys-kernel/linux-image/linux-image-4.16.1.ebuild +++ b/sys-kernel/linux-image/linux-image-4.16.1.ebuild @@ -34,6 +34,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/enable_alx_wol.patch "${FILESDIR}"/0001-Revert-ath10k-activate-user-space-firmware-loading-a.patch "${FILESDIR}"/0001-Revert-swiotlb-remove-various-exports.patch + "${FILESDIR}"/0001-Revert-x86-ACPI-cstate-Allow-ACPI-C1-FFH-MWAIT-use-o.patch "${FILESDIR}"/mute-pps_state_mismatch.patch "${FILESDIR}"/drop_ancient-and-wrong-msg.patch "${FILESDIR}"/uksm-4.16.patch ) |