upgpkg: 3.17.3-1
This commit is contained in:
parent
89b8ecf64e
commit
e9963cc887
12
PKGBUILD
12
PKGBUILD
|
@ -4,7 +4,7 @@
|
||||||
pkgbase=linux # Build stock -ARCH kernel
|
pkgbase=linux # Build stock -ARCH kernel
|
||||||
#pkgbase=linux-custom # Build kernel with a different name
|
#pkgbase=linux-custom # Build kernel with a different name
|
||||||
_srcname=linux-3.17
|
_srcname=linux-3.17
|
||||||
pkgver=3.17.2
|
pkgver=3.17.3
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
url="http://www.kernel.org/"
|
url="http://www.kernel.org/"
|
||||||
|
@ -18,13 +18,15 @@ source=("https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
|
||||||
# standard config files for mkinitcpio ramdisk
|
# standard config files for mkinitcpio ramdisk
|
||||||
'linux.preset'
|
'linux.preset'
|
||||||
'change-default-console-loglevel.patch'
|
'change-default-console-loglevel.patch'
|
||||||
|
'fix_CPU0_microcode_on_resume.patch'
|
||||||
)
|
)
|
||||||
sha256sums=('f5153ec93c5fcd41b247950e6a9bcbc63fa87beafd112c133a622439a0f76251'
|
sha256sums=('f5153ec93c5fcd41b247950e6a9bcbc63fa87beafd112c133a622439a0f76251'
|
||||||
'4576c30a46c016502cdd007d28dde4f2d141c0f8096be8623a9ff519323db777'
|
'3c1ba3cc89d0f2d5f7303f448495f64db1ab96efea5f5fdd4b4c8c547600f85d'
|
||||||
'0f1cd431115a2ce84629298d054d5e6f6e78095a3aeda4d1335740c9402efb7e'
|
'0f1cd431115a2ce84629298d054d5e6f6e78095a3aeda4d1335740c9402efb7e'
|
||||||
'fb688bc7ccfa636990b26aecfe62500bc1e0f6c410a837eef03014c161df2ec8'
|
'fb688bc7ccfa636990b26aecfe62500bc1e0f6c410a837eef03014c161df2ec8'
|
||||||
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
|
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
|
||||||
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99')
|
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
|
||||||
|
'43668fe46147fe93f41b919db673574427ce5a8c376cd28ddddcbf3a00326491')
|
||||||
|
|
||||||
_kernelname=${pkgbase#linux}
|
_kernelname=${pkgbase#linux}
|
||||||
|
|
||||||
|
@ -42,6 +44,10 @@ prepare() {
|
||||||
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
|
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
|
||||||
patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
|
patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
|
||||||
|
|
||||||
|
# Fix FS#42689
|
||||||
|
# https://bugzilla.kernel.org/show_bug.cgi?id=88001
|
||||||
|
patch -p1 -i "${srcdir}/fix_CPU0_microcode_on_resume.patch"
|
||||||
|
|
||||||
if [ "${CARCH}" = "x86_64" ]; then
|
if [ "${CARCH}" = "x86_64" ]; then
|
||||||
cat "${srcdir}/config.x86_64" > ./.config
|
cat "${srcdir}/config.x86_64" > ./.config
|
||||||
else
|
else
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
|
|
||||||
index 7297df2..26bfd7b 100644
|
|
||||||
--- a/drivers/platform/x86/compal-laptop.c
|
|
||||||
+++ b/drivers/platform/x86/compal-laptop.c
|
|
||||||
@@ -1028,7 +1028,7 @@ static int compal_probe(struct platform_device *pdev)
|
|
||||||
return err;
|
|
||||||
|
|
||||||
hwmon_dev = hwmon_device_register_with_groups(&pdev->dev,
|
|
||||||
- DRIVER_NAME, data,
|
|
||||||
+ "compal", data,
|
|
||||||
compal_hwmon_groups);
|
|
||||||
if (IS_ERR(hwmon_dev)) {
|
|
||||||
err = PTR_ERR(hwmon_dev);
|
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
|
||||||
|
index dd9d6190b08d..181e42bd85d3 100644
|
||||||
|
--- a/arch/x86/kernel/cpu/microcode/core.c
|
||||||
|
+++ b/arch/x86/kernel/cpu/microcode/core.c
|
||||||
|
@@ -85,6 +85,7 @@
|
||||||
|
#include <linux/syscore_ops.h>
|
||||||
|
|
||||||
|
#include <asm/microcode.h>
|
||||||
|
+#include <asm/microcode_intel.h>
|
||||||
|
#include <asm/processor.h>
|
||||||
|
#include <asm/cpu_device_id.h>
|
||||||
|
#include <asm/perf_event.h>
|
||||||
|
@@ -465,6 +466,8 @@ static void mc_bp_resume(void)
|
||||||
|
|
||||||
|
if (uci->valid && uci->mc)
|
||||||
|
microcode_ops->apply_microcode(cpu);
|
||||||
|
+ else if (!uci->mc)
|
||||||
|
+ load_ucode_intel_ap();
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct syscore_ops mc_syscore_ops = {
|
Loading…
Reference in New Issue