diff options
author | Anatolii Sakhnik | 2016-07-29 12:02:39 +0300 |
---|---|---|
committer | Anatolii Sakhnik | 2016-07-29 12:03:52 +0300 |
commit | cf3456acc37086938a1ab4427fbc0d2c717a6cda (patch) | |
tree | 1e849b287fd7dfd118d8d5c8b6027f6b758b5cca | |
parent | 0c86b91f1cec11805d0041fa25d3f84e074cd56b (diff) | |
download | aur-cf3456acc37086938a1ab4427fbc0d2c717a6cda.tar.gz |
Upgrade to 4.6.5
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | 0001-linux-4.6-rtlwifi-fix-atomic.patch | 70 | ||||
-rw-r--r-- | PKGBUILD | 16 |
3 files changed, 10 insertions, 88 deletions
@@ -1,7 +1,7 @@ # Generated by mksrcinfo v8 -# Wed Jul 13 09:25:30 UTC 2016 +# Fri Jul 29 09:02:35 UTC 2016 pkgbase = linux-c720 - pkgver = 4.6.4 + pkgver = 4.6.5 pkgrel = 1 url = http://www.kernel.org/ arch = i686 @@ -16,22 +16,20 @@ pkgbase = linux-c720 options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.6.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.6.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.6.4.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.6.4.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.6.5.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.6.5.sign source = config source = config.x86_64 source = linux.preset source = change-default-console-loglevel.patch - source = 0001-linux-4.6-rtlwifi-fix-atomic.patch sha256sums = a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866 sha256sums = SKIP - sha256sums = f500a3b841c41420914938d681e258c712fbbd7ebec5fe70f0abc071a1738e47 + sha256sums = 857df33f085a0116b9d2322ffe3b23d5b7d8c4898427d79f68108a653e84910c sha256sums = SKIP sha256sums = 56a56f6b0d8edaa6f58342ab9d54392503dfa6ca884a0b936cbf0206604758d2 sha256sums = 88a62ee2670e292c8a36d266c440b08a2d3bba744908ca27f4f52d999486d255 sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 - sha256sums = ae0d16e81a915fae130125ba9d0b6fd2427e06f50b8b9514abc4029efe61ee98 pkgname = linux-c720 pkgdesc = The Linux-c720 kernel and modules diff --git a/0001-linux-4.6-rtlwifi-fix-atomic.patch b/0001-linux-4.6-rtlwifi-fix-atomic.patch deleted file mode 100644 index e514ec85f906..000000000000 --- a/0001-linux-4.6-rtlwifi-fix-atomic.patch +++ /dev/null @@ -1,70 +0,0 @@ -From de26859dcf363d520cc44e59f6dcaf20ebe0aadf Mon Sep 17 00:00:00 2001 -From: Larry Finger <Larry.Finger@lwfinger.net> -Date: Sat, 21 May 2016 11:50:35 -0500 -Subject: rtlwifi: Fix scheduling while atomic error from commit 49f86ec21c01 - -Commit 49f86ec21c01 ("rtlwifi: Change long delays to sleeps") was correct -for most cases; however, driver rtl8192ce calls the affected routines while -in atomic context. The kernel bug output is as follows: - -BUG: scheduling while atomic: wpa_supplicant/627/0x00000002 -[...] - [<ffffffff815c2b39>] __schedule+0x899/0xad0 - [<ffffffff815c2dac>] schedule+0x3c/0x90 - [<ffffffff815c5bb2>] schedule_hrtimeout_range_clock+0xa2/0x120 - [<ffffffff810e8b80>] ? hrtimer_init+0x120/0x120 - [<ffffffff815c5ba6>] ? schedule_hrtimeout_range_clock+0x96/0x120 - [<ffffffff815c5c43>] schedule_hrtimeout_range+0x13/0x20 - [<ffffffff815c568f>] usleep_range+0x4f/0x70 - [<ffffffffa0667218>] rtl_rfreg_delay+0x38/0x50 [rtlwifi] - [<ffffffffa06dd0e7>] rtl92c_phy_config_rf_with_headerfile+0xc7/0xe0 [rtl8192ce] - -To fix this bug, three of the changes from delay to sleep are reverted. -Unfortunately, one of the changes involves a delay of 50 msec. The calling -code will be modified so that this long delay can be avoided; however, -this change is being pushed now to fix the problem in kernel 4.6.0. - -Fixes: 49f86ec21c01 ("rtlwifi: Change long delays to sleeps") -Reported-by: James Feeney <james@nurealm.net> -Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> -Cc: James Feeney <james@nurealm.net> -Cc: Stable <stable@vger.kernel.org> [4.6+] -Signed-off-by: Kalle Valo <kvalo@codeaurora.org> ---- - drivers/net/wireless/realtek/rtlwifi/core.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c -index 0f48048..3a0faa8 100644 ---- a/drivers/net/wireless/realtek/rtlwifi/core.c -+++ b/drivers/net/wireless/realtek/rtlwifi/core.c -@@ -54,7 +54,7 @@ EXPORT_SYMBOL(channel5g_80m); - void rtl_addr_delay(u32 addr) - { - if (addr == 0xfe) -- msleep(50); -+ mdelay(50); - else if (addr == 0xfd) - msleep(5); - else if (addr == 0xfc) -@@ -75,7 +75,7 @@ void rtl_rfreg_delay(struct ieee80211_hw *hw, enum radio_path rfpath, u32 addr, - rtl_addr_delay(addr); - } else { - rtl_set_rfreg(hw, rfpath, addr, mask, data); -- usleep_range(1, 2); -+ udelay(1); - } - } - EXPORT_SYMBOL(rtl_rfreg_delay); -@@ -86,7 +86,7 @@ void rtl_bb_delay(struct ieee80211_hw *hw, u32 addr, u32 data) - rtl_addr_delay(addr); - } else { - rtl_set_bbreg(hw, addr, MASKDWORD, data); -- usleep_range(1, 2); -+ udelay(1); - } - } - EXPORT_SYMBOL(rtl_bb_delay); --- -cgit v0.12 - @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 271484 2016-07-12 06:00:49Z tpowa $ +# $Id: PKGBUILD 272545 2016-07-28 08:27:39Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> #pkgbase=linux # Build stock -ARCH kernel pkgbase=linux-c720 # Build kernel with a different name _srcname=linux-4.6 -pkgver=4.6.4 +pkgver=4.6.5 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -20,18 +20,16 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" 'config' 'config.x86_64' # standard config files for mkinitcpio ramdisk 'linux.preset' - 'change-default-console-loglevel.patch' - '0001-linux-4.6-rtlwifi-fix-atomic.patch') + 'change-default-console-loglevel.patch') sha256sums=('a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866' 'SKIP' - 'f500a3b841c41420914938d681e258c712fbbd7ebec5fe70f0abc071a1738e47' + '857df33f085a0116b9d2322ffe3b23d5b7d8c4898427d79f68108a653e84910c' 'SKIP' '56a56f6b0d8edaa6f58342ab9d54392503dfa6ca884a0b936cbf0206604758d2' '88a62ee2670e292c8a36d266c440b08a2d3bba744908ca27f4f52d999486d255' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' - '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - 'ae0d16e81a915fae130125ba9d0b6fd2427e06f50b8b9514abc4029efe61ee98') + '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman @@ -53,10 +51,6 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" - # fix rtlwifi atomic - # https://bugs.archlinux.org/task/49401 - patch -p1 -i "${srcdir}/0001-linux-4.6-rtlwifi-fix-atomic.patch" - if [ "${CARCH}" = "x86_64" ]; then cat "${srcdir}/config.x86_64" > ./.config else |