diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2013-10-08 18:59:13 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2013-10-08 18:59:13 +0100 |
| commit | 874c607aa22b0e75adf0e6ace71d997b261e7268 (patch) | |
| tree | ecadb63b70ec41729cda7716078dd1129dc36960 | |
| parent | 0203905c4c32e46f1b4af3c89b2db8aeef02ad43 (diff) | |
| download | kernel-874c607aa22b0e75adf0e6ace71d997b261e7268.tar.gz kernel-874c607aa22b0e75adf0e6ace71d997b261e7268.tar.xz kernel-874c607aa22b0e75adf0e6ace71d997b261e7268.zip | |
drop upstreamed already disabled ARM patch
| -rw-r--r-- | arm-dma-amba_pl08x-avoid-64bit-division.patch | 36 | ||||
| -rw-r--r-- | kernel.spec | 2 |
2 files changed, 0 insertions, 38 deletions
diff --git a/arm-dma-amba_pl08x-avoid-64bit-division.patch b/arm-dma-amba_pl08x-avoid-64bit-division.patch deleted file mode 100644 index 01da25c1f..000000000 --- a/arm-dma-amba_pl08x-avoid-64bit-division.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c -index 06fe45c..63744cf 100644 ---- a/drivers/dma/amba-pl08x.c -+++ b/drivers/dma/amba-pl08x.c -@@ -886,8 +886,8 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, - return 0; - } - -- if ((bd.srcbus.addr % bd.srcbus.buswidth) || -- (bd.dstbus.addr % bd.dstbus.buswidth)) { -+ if ((((u8)(bd.srcbus.addr & 0xff)) % bd.srcbus.buswidth) || -+ (((u8)(bd.dstbus.addr & 0xff)) % bd.dstbus.buswidth)) { - dev_err(&pl08x->adev->dev, - "%s src & dst address must be aligned to src" - " & dst width if peripheral is flow controller", -@@ -908,9 +908,8 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, - */ - if (bd.remainder < mbus->buswidth) - early_bytes = bd.remainder; -- else if ((mbus->addr) % (mbus->buswidth)) { -- early_bytes = mbus->buswidth - (mbus->addr) % -- (mbus->buswidth); -+ else if ((early_bytes = (u8)(mbus->addr & 0xff) % mbus->buswidth)) { -+ early_bytes = mbus->buswidth - early_bytes; - if ((bd.remainder - early_bytes) < mbus->buswidth) - early_bytes = bd.remainder; - } -@@ -928,7 +927,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, - * Master now aligned - * - if slave is not then we must set its width down - */ -- if (sbus->addr % sbus->buswidth) { -+ if (((u8)(sbus->addr & 0xff)) % sbus->buswidth) { - dev_dbg(&pl08x->adev->dev, - "%s set down bus width to one byte\n", - __func__); diff --git a/kernel.spec b/kernel.spec index 912bb8e18..86f4899cb 100644 --- a/kernel.spec +++ b/kernel.spec @@ -703,7 +703,6 @@ Patch15000: nowatchdog-on-virt.patch # lpae Patch21001: arm-lpae-ax88796.patch -Patch21003: arm-dma-amba_pl08x-avoid-64bit-division.patch Patch21004: arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch Patch21005: arm-exynos-mp.patch @@ -1301,7 +1300,6 @@ ApplyPatch debug-bad-pte-modules.patch # ARM # ApplyPatch arm-lpae-ax88796.patch -#ApplyPatch arm-dma-amba_pl08x-avoid-64bit-division.patch ApplyPatch arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch #pplyPatch arm-exynos-mp.patch ApplyPatch arm-omap-load-tfp410.patch |