From: Greg Kroah-Hartman Date: Fri, 21 Sep 2018 12:01:00 +0000 (+0200) Subject: drop alsa sparse patch X-Git-Tag: v3.18.123~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b0a1a777449c1b695a9e012e60ff4d4701ace72;p=thirdparty%2Fkernel%2Fstable-queue.git drop alsa sparse patch --- diff --git a/queue-4.14/alsa-pcm-add-__force-to-cast-in-snd_pcm_lib_read-write.patch b/queue-4.14/alsa-pcm-add-__force-to-cast-in-snd_pcm_lib_read-write.patch deleted file mode 100644 index 8489797ec87..00000000000 --- a/queue-4.14/alsa-pcm-add-__force-to-cast-in-snd_pcm_lib_read-write.patch +++ /dev/null @@ -1,43 +0,0 @@ -From foo@baz Fri Sep 21 09:51:45 CEST 2018 -From: Takashi Iwai -Date: Wed, 25 Jul 2018 23:00:54 +0200 -Subject: ALSA: pcm: Add __force to cast in snd_pcm_lib_read/write() - -From: Takashi Iwai - -[ Upstream commit 95a48b7d4459948b6bacf809809cf01a7dc06d1d ] - -The snd_pcm_lib_read() and snd_pcm_lib_write() inline functions have -the explicit cast from a user pointer to a kernel pointer, but they -lacks of __force prefix. - -This fixes sparse warnings like: - ./include/sound/pcm.h:1093:47: warning: cast removes address space of expression - -Fixes: 68541213720d ("ALSA: pcm: Direct in-kernel read/write support") -Signed-off-by: Takashi Iwai -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - include/sound/pcm.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/include/sound/pcm.h -+++ b/include/sound/pcm.h -@@ -1081,14 +1081,14 @@ static inline snd_pcm_sframes_t - snd_pcm_lib_write(struct snd_pcm_substream *substream, - const void __user *buf, snd_pcm_uframes_t frames) - { -- return __snd_pcm_lib_xfer(substream, (void *)buf, true, frames, false); -+ return __snd_pcm_lib_xfer(substream, (void __force *)buf, true, frames, false); - } - - static inline snd_pcm_sframes_t - snd_pcm_lib_read(struct snd_pcm_substream *substream, - void __user *buf, snd_pcm_uframes_t frames) - { -- return __snd_pcm_lib_xfer(substream, (void *)buf, true, frames, false); -+ return __snd_pcm_lib_xfer(substream, (void __force *)buf, true, frames, false); - } - - static inline snd_pcm_sframes_t diff --git a/queue-4.14/series b/queue-4.14/series index f9510d3da0c..b7ffb1eb143 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -13,7 +13,6 @@ hv-netvsc-fix-null-dereference-at-single-queue-mode-fallback.patch usb-dwc3-change-stream-event-enable-bit-back-to-13.patch iommu-arm-smmu-v3-sync-the-ovackflg-to-priq-consumer-register.patch iommu-io-pgtable-arm-v7s-abort-allocation-when-table-address-overflows-the-pte.patch -alsa-pcm-add-__force-to-cast-in-snd_pcm_lib_read-write.patch alsa-msnd-fix-the-default-sample-sizes.patch alsa-usb-audio-fix-multiple-definitions-in-au0828_device-macro.patch xfrm-fix-passing-zero-to-err_ptr-warning.patch diff --git a/queue-4.18/alsa-pcm-add-__force-to-cast-in-snd_pcm_lib_read-write.patch b/queue-4.18/alsa-pcm-add-__force-to-cast-in-snd_pcm_lib_read-write.patch deleted file mode 100644 index 78fd6c93a8d..00000000000 --- a/queue-4.18/alsa-pcm-add-__force-to-cast-in-snd_pcm_lib_read-write.patch +++ /dev/null @@ -1,43 +0,0 @@ -From foo@baz Fri Sep 21 10:21:24 CEST 2018 -From: Takashi Iwai -Date: Wed, 25 Jul 2018 23:00:54 +0200 -Subject: ALSA: pcm: Add __force to cast in snd_pcm_lib_read/write() - -From: Takashi Iwai - -[ Upstream commit 95a48b7d4459948b6bacf809809cf01a7dc06d1d ] - -The snd_pcm_lib_read() and snd_pcm_lib_write() inline functions have -the explicit cast from a user pointer to a kernel pointer, but they -lacks of __force prefix. - -This fixes sparse warnings like: - ./include/sound/pcm.h:1093:47: warning: cast removes address space of expression - -Fixes: 68541213720d ("ALSA: pcm: Direct in-kernel read/write support") -Signed-off-by: Takashi Iwai -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - include/sound/pcm.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/include/sound/pcm.h -+++ b/include/sound/pcm.h -@@ -1089,14 +1089,14 @@ static inline snd_pcm_sframes_t - snd_pcm_lib_write(struct snd_pcm_substream *substream, - const void __user *buf, snd_pcm_uframes_t frames) - { -- return __snd_pcm_lib_xfer(substream, (void *)buf, true, frames, false); -+ return __snd_pcm_lib_xfer(substream, (void __force *)buf, true, frames, false); - } - - static inline snd_pcm_sframes_t - snd_pcm_lib_read(struct snd_pcm_substream *substream, - void __user *buf, snd_pcm_uframes_t frames) - { -- return __snd_pcm_lib_xfer(substream, (void *)buf, true, frames, false); -+ return __snd_pcm_lib_xfer(substream, (void __force *)buf, true, frames, false); - } - - static inline snd_pcm_sframes_t diff --git a/queue-4.18/series b/queue-4.18/series index c2d04eacbd9..2b860067eec 100644 --- a/queue-4.18/series +++ b/queue-4.18/series @@ -17,7 +17,6 @@ usb-dwc3-change-stream-event-enable-bit-back-to-13.patch iommu-arm-smmu-v3-sync-the-ovackflg-to-priq-consumer-register.patch iommu-io-pgtable-arm-v7s-abort-allocation-when-table-address-overflows-the-pte.patch iommu-io-pgtable-arm-fix-pgtable-allocation-in-selftest.patch -alsa-pcm-add-__force-to-cast-in-snd_pcm_lib_read-write.patch alsa-msnd-fix-the-default-sample-sizes.patch alsa-usb-audio-add-support-for-encore-mdsd-usb-dac.patch alsa-usb-audio-fix-multiple-definitions-in-au0828_device-macro.patch