archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-01-27 23:44:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/linux-aarch64-rc to 4.10.rc4-1

Browse source
This commit is contained in:
Kevin Mihelich 2017-01-16 00:58:08 +00:00
parent 71874a574c
commit 3c085f26c1
3 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/linux-aarch64-rc/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
View file

@ -1,7 +1,7 @@
From db337e0e4c54d91a3cbfaea8857951b8f6b7711c Mon Sep 17 00:00:00 2001
From 844ea6381384a3565d9f9d3eb94f10fb951809bb Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 18 Feb 2014 01:43:50 -0300
Subject: [PATCH] net/smsc95xx: Allow mac address to be set as a parameter
Subject: [PATCH 1/2] net/smsc95xx: Allow mac address to be set as a parameter
---
drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++

25
core/linux-aarch64-rc/0002-i2c-bcm2835-prevent-null-pointer-dereference.patch Normal file
View file

@ -0,0 +1,25 @@
From 3596276e2c034b2243d5e384e9ffb787f137158a Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 13 Jan 2017 13:10:02 -0700
Subject: [PATCH 2/2] i2c: bcm2835: prevent null pointer dereference
---
drivers/i2c/busses/i2c-bcm2835.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
index c3436f627028..cc840b86caab 100644
--- a/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
@@ -195,7 +195,7 @@ static irqreturn_t bcm2835_i2c_isr(int this_irq, void *data)
}
if (val & BCM2835_I2C_S_DONE) {
- if (i2c_dev->curr_msg->flags & I2C_M_RD) {
+ if (i2c_dev->curr_msg && (i2c_dev->curr_msg->flags & I2C_M_RD)) {
bcm2835_drain_rxfifo(i2c_dev);
val = bcm2835_i2c_readl(i2c_dev, BCM2835_I2C_S);
}
--
2.11.0

9
core/linux-aarch64-rc/PKGBUILD
View file

@ -4,7 +4,7 @@
buildarch=8
_rcver=4.10
_rcrel=3
_rcrel=4
pkgbase=linux-aarch64-rc
_srcname=linux-${_rcver}-rc${_rcrel}
@ -19,10 +19,12 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git')
options=('!strip')
source=("https://www.kernel.org/pub/linux/kernel/v4.x/testing/${_srcname}.tar.xz"
'0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
'0002-i2c-bcm2835-prevent-null-pointer-dereference.patch'
'config'
'linux.preset')
md5sums=('f023c220594e730d9f620eb9079a7cee'
'1eb6bdcfd408c4e35de1ed673403307f'
md5sums=('a5e775559b20450b34b4824d6751a1fb'
'40b8809ecbbac362d3e61dea5dd1303b'
'044f34cba214ed2e9f4dbd1c6a4925e4'
'42c2d207690620c90ae15a9a864052db'
'25d8f6983c9a616946848c0e075a949c')
@ -31,6 +33,7 @@ prepare() {
# ALARM patches
git apply ../0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
git apply ../0002-i2c-bcm2835-prevent-null-pointer-dereference.patch
cat "${srcdir}/config" > ./.config