diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-12-18 16:34:37 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-12-24 01:22:45 +0100 |
| commit | 7604e53d5f593120449cdaf059bfaf66ec07607e (patch) | |
| tree | 264a5d24c34f29c1d0b34e2c8c8ac554d5e0a912 /target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch | |
| parent | db992e7b53f5a3b614c27f9f2d589128c570a821 (diff) | |
| download | upstream-7604e53d5f593120449cdaf059bfaf66ec07607e.tar.gz upstream-7604e53d5f593120449cdaf059bfaf66ec07607e.tar.bz2 upstream-7604e53d5f593120449cdaf059bfaf66ec07607e.zip | |
kernel: bump 4.14 to 4.14.159
Refreshed all patches.
Remove upstreamed:
- 302-0002-dmaengine-dw-implement-per-channel-protection-contro.patch
Fixes:
- CVE-2019-19332
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch')
| -rw-r--r-- | target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch b/target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch index 1b13c345cc..9c3b9fe705 100644 --- a/target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch +++ b/target/linux/apm821xx/patches-4.14/021-0001-crypto-crypto4xx-shuffle-iomap-in-front-of-request_i.patch @@ -17,7 +17,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com> --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c -@@ -1084,9 +1084,6 @@ static irqreturn_t crypto4xx_ce_interrup +@@ -1080,9 +1080,6 @@ static irqreturn_t crypto4xx_ce_interrup struct device *dev = (struct device *)data; struct crypto4xx_core_device *core_dev = dev_get_drvdata(dev); @@ -27,7 +27,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com> writel(PPC4XX_INTERRUPT_CLR, core_dev->dev->ce_base + CRYPTO4XX_INT_CLR); tasklet_schedule(&core_dev->tasklet); -@@ -1334,13 +1331,6 @@ static int crypto4xx_probe(struct platfo +@@ -1330,13 +1327,6 @@ static int crypto4xx_probe(struct platfo tasklet_init(&core_dev->tasklet, crypto4xx_bh_tasklet_cb, (unsigned long) dev); @@ -41,7 +41,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com> core_dev->dev->ce_base = of_iomap(ofdev->dev.of_node, 0); if (!core_dev->dev->ce_base) { dev_err(dev, "failed to of_iomap\n"); -@@ -1348,6 +1338,13 @@ static int crypto4xx_probe(struct platfo +@@ -1344,6 +1334,13 @@ static int crypto4xx_probe(struct platfo goto err_iomap; } @@ -55,7 +55,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com> /* need to setup pdr, rdr, gdr and sdr before this */ crypto4xx_hw_init(core_dev->dev); -@@ -1361,11 +1358,11 @@ static int crypto4xx_probe(struct platfo +@@ -1357,11 +1354,11 @@ static int crypto4xx_probe(struct platfo return 0; err_start_dev: |