summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2013-07-29 17:01:11 -0400
committerKyle McMartin <kyle@redhat.com>2013-07-29 17:01:11 -0400
commit963bc0bed3c9050b634b22c496fd15f11cbf2d8b (patch)
treead749afefdd110a24084bd32964f76575871a78b
parenta2366c039728a418d69841f36b04bb6f8201a71b (diff)
downloadkernel-963bc0bed3c9050b634b22c496fd15f11cbf2d8b.tar.gz
kernel-963bc0bed3c9050b634b22c496fd15f11cbf2d8b.tar.xz
kernel-963bc0bed3c9050b634b22c496fd15f11cbf2d8b.zip
yet another 64-bit libgcc callout
-rw-r--r--arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch13
-rw-r--r--kernel.spec5
2 files changed, 18 insertions, 0 deletions
diff --git a/arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch b/arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch
new file mode 100644
index 000000000..d6de76989
--- /dev/null
+++ b/arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch
@@ -0,0 +1,13 @@
+diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c
+index 21b7926..19e6662 100644
+--- a/sound/soc/samsung/dma.c
++++ b/sound/soc/samsung/dma.c
+@@ -76,7 +76,7 @@ static void dma_enqueue(struct snd_pcm_substream *substream)
+
+ pr_debug("Entered %s\n", __func__);
+
+- limit = (prtd->dma_end - prtd->dma_start) / prtd->dma_period;
++ limit = (u32)(prtd->dma_end - prtd->dma_start) / prtd->dma_period;
+
+ pr_debug("%s: loaded %d, limit %d\n",
+ __func__, prtd->dma_loaded, limit);
diff --git a/kernel.spec b/kernel.spec
index 6e7759121..f1cfbbc0d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -695,6 +695,7 @@ Patch15000: nowatchdog-on-virt.patch
Patch21001: arm-lpae-ax88796.patch
Patch21002: drm-exynos-fix-multiple-definition-build-error.patch
Patch21003: arm-dma-amba_pl08x-avoid-64bit-division.patch
+Patch21004: arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch
# ARM omap
Patch21010: arm-omap-load-tfp410.patch
@@ -1304,6 +1305,7 @@ ApplyPatch debug-bad-pte-modules.patch
ApplyPatch arm-lpae-ax88796.patch
ApplyPatch drm-exynos-fix-multiple-definition-build-error.patch
ApplyPatch arm-dma-amba_pl08x-avoid-64bit-division.patch
+ApplyPatch arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch
ApplyPatch arm-omap-load-tfp410.patch
ApplyPatch arm-tegra-usb-no-reset-linux33.patch
ApplyPatch arm-tegra-remove-direct-vbus-regulator-control.patch
@@ -2249,6 +2251,9 @@ fi
# || ||
%changelog
* Mon Jul 29 2013 Kyle McMartin <kyle@redhat.com> - 3.11.0-0.rc3.git0.1
+- arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch: ditto
+
+* Mon Jul 29 2013 Kyle McMartin <kyle@redhat.com>
- arm-dma-amba_pl08x-avoid-64bit-division.patch: STAHP libgcc callouts
* Mon Jul 29 2013 Josh Boyer <jwboyer@redhat.com>