diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | 0001-linux-4.6-rtlwifi-fix-atomic.patch | 70 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | config | 2 | ||||
| -rw-r--r-- | config.x86_64 | 2 |
5 files changed, 18 insertions, 82 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-macbook - pkgver = 4.7 + pkgver = 4.7.1 pkgrel = 1 url = http://www.kernel.org/ arch = i686 @@ -14,6 +14,8 @@ pkgbase = linux-macbook options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.7.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.7.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.7.1.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.7.1.sign source = config source = config.x86_64 source = linux-macbook.preset @@ -25,8 +27,10 @@ pkgbase = linux-macbook validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = 5190c3d1209aeda04168145bf50569dc0984f80467159b1dc50ad731e3285f10 sha256sums = SKIP - sha256sums = e9b7f502b5e27fc4154f0b98f3870f2988b58414df948a61a82502d84bc68a72 - sha256sums = 0004f61a57696a41a1bca1a4a2e6abb03b6ae1b2e67ce73055ae062764660f2f + sha256sums = 838fa595436fbf9f70759aa43c1cacd83cc0adc95d166648c1625ebd50fad04e + sha256sums = SKIP + sha256sums = ba61080d6ba852b3dc10ed056efbd80bdff6555a7ae4cf40373c7544d36ffcc9 + sha256sums = 3b41dde76dd69ec6e088bd19e724f3eabd30eaf43727a1948c6603242dc08cd8 sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c sha256sums = bb8af32880059e681396a250d8e78f600f248da8ad4f0e76d7923badb5ee8b42 sha256sums = 103cac598bf92519d6c0b04ca729565bad75015daade422c81225e399c967b4c 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 - @@ -5,7 +5,7 @@ pkgbase=linux-macbook # Build kernel with a different name _srcname=linux-4.7 -pkgver=4.7 +pkgver=4.7.1 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -14,8 +14,8 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'libelf') options=('!strip') source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" "https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign" - #"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" - #"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign" + "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz" + "https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign" # the main kernel config files 'config' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -27,8 +27,10 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" sha256sums=('5190c3d1209aeda04168145bf50569dc0984f80467159b1dc50ad731e3285f10' 'SKIP' - 'e9b7f502b5e27fc4154f0b98f3870f2988b58414df948a61a82502d84bc68a72' - '0004f61a57696a41a1bca1a4a2e6abb03b6ae1b2e67ce73055ae062764660f2f' + '838fa595436fbf9f70759aa43c1cacd83cc0adc95d166648c1625ebd50fad04e' + 'SKIP' + 'ba61080d6ba852b3dc10ed056efbd80bdff6555a7ae4cf40373c7544d36ffcc9' + '3b41dde76dd69ec6e088bd19e724f3eabd30eaf43727a1948c6603242dc08cd8' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' 'bb8af32880059e681396a250d8e78f600f248da8ad4f0e76d7923badb5ee8b42' '103cac598bf92519d6c0b04ca729565bad75015daade422c81225e399c967b4c' @@ -45,7 +47,7 @@ prepare() { cd "${srcdir}/${_srcname}" # add upstream patch - #patch -p1 -i "${srcdir}/patch-${pkgver}" + patch -p1 -i "${srcdir}/patch-${pkgver}" # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git @@ -257,7 +259,7 @@ _package-headers() { # add objtool for external module building and enabled VALIDATION_STACK option if [ -f tools/objtool/objtool ]; then mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/tools/objtool" - cp -a tools/objtool/objtool ${pkgdir}/usr/lib/modules/${_kernver}/build/tools/objtool/ + cp -a tools/objtool/objtool ${pkgdir}/usr/lib/modules/${_kernver}/build/tools/objtool/ fi chown -R root.root "${pkgdir}/usr/lib/modules/${_kernver}/build" @@ -6377,7 +6377,7 @@ CONFIG_ASYNC_TX_DMA=y # # DMABUF options # -# CONFIG_SYNC_FILE is not set +CONFIG_SYNC_FILE=y CONFIG_AUXDISPLAY=y CONFIG_KS0108=m CONFIG_KS0108_PORT=0x378 diff --git a/config.x86_64 b/config.x86_64 index 8cd604b5da1a..c197e7ae8bce 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -6151,7 +6151,7 @@ CONFIG_DMA_ENGINE_RAID=y # # DMABUF options # -# CONFIG_SYNC_FILE is not set +CONFIG_SYNC_FILE=y CONFIG_DCA=m CONFIG_AUXDISPLAY=y CONFIG_KS0108=m |