diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-03-18 16:30:07 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-03-18 16:30:07 -0300 |
| commit | 837518fec0732b060083f3c4038980d47020939f (patch) | |
| tree | 56be65b9482b3ca41be1cdeb1b6c975635aed62c /libre/linux-libre-grsec | |
| parent | ab06380157de4001dbdb624c1cab7dc50cc27b60 (diff) | |
linux-libre-grsec{,-knock}: fix undeclared variable
Diffstat (limited to 'libre/linux-libre-grsec')
| -rw-r--r-- | libre/linux-libre-grsec/0001-ARM-fix-ops-undeclared-first-use-in-this-function.patch | 13 | ||||
| -rw-r--r-- | libre/linux-libre-grsec/PKGBUILD | 5 |
2 files changed, 18 insertions, 0 deletions
diff --git a/libre/linux-libre-grsec/0001-ARM-fix-ops-undeclared-first-use-in-this-function.patch b/libre/linux-libre-grsec/0001-ARM-fix-ops-undeclared-first-use-in-this-function.patch new file mode 100644 index 000000000..28cccb974 --- /dev/null +++ b/libre/linux-libre-grsec/0001-ARM-fix-ops-undeclared-first-use-in-this-function.patch @@ -0,0 +1,13 @@ +diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c +index 2bfe405..aa39188 100644 +--- a/drivers/iommu/arm-smmu.c ++++ b/drivers/iommu/arm-smmu.c +@@ -1228,7 +1228,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain, + dev_err(dev, + "iova to phys timed out on %pad. Falling back to software table walk.\n", + &iova); +- return iop->ops->iova_to_phys(ops, iova); ++ return iop->ops->iova_to_phys(iop, iova); + } + + phys = readl_relaxed(cb_base + ARM_SMMU_CB_PAR_LO); diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 7f017ea67..b1935ef92 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -54,6 +54,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li "https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch" "https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch.sig" '0001-ARM-disable-implicit-function-declaration-error.patch' + '0001-ARM-fix-ops-undeclared-first-use-in-this-function.patch' '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch' '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch' '0003-SMILE-Plug-device-tree-file.patch' @@ -85,6 +86,7 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0' '5a8d8fe270a5423fb5f712aebf55d367906a8f44f1ca343341ab67619479a319' 'SKIP' '1fc7055041da895d5d023fcf0c5e06d00a3506ae98931138229dba7392e2c382' + 'bd7e6446b8ca7724642f8317326fe228b116be28f9649b5783530d7c0899ded8' 'a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817' '486976f36e1919eac5ee984cb9a8d23a972f23f22f8344eda47b487ea91047f4' '6dadc17ea56d93ec0f1d0c3c98c25a7863e9ba3c4af50dc411d630a1bcc98f08' @@ -129,6 +131,9 @@ prepare() { # disable implicit function declaration error since grsecurity patches conflicts against some RCN modules patch -p1 -i "${srcdir}/0001-ARM-disable-implicit-function-declaration-error.patch" + # fix undeclared variable + patch -p1 -i "${srcdir}/0001-ARM-fix-ops-undeclared-first-use-in-this-function.patch" + # ALARM patches patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch" patch -p1 -i "${srcdir}/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch" |