merged.
Bruce
In message: [linux-yocto][v5.10/standard/nxp-sdk-5.10/nxp-soc &
v5.10/standard/preempt-rt/nxp-sdk-5.10/nxp-soc][PATCH] LF-3332-1: arm64: imx8:
vpu: fix build errors due to API change
on 16/01/2023 Li Wang wrote:
> From: Zhou Peng
>
> commit 67ee385c11e1c6b3a8376b40682ba364c130215c from
> https://source.codeaurora.org/external/imx/linux-imx
>
> hantro g1/g2/h1/vc8000:
> replace get_fs()/set_fs() with force_uaccess_xxx()
>
> Signed-off-by: Zhou Peng
> Signed-off-by: Xiaolei Wang
> Signed-off-by: Li Wang
> ---
> drivers/mxc/hantro/hantrodec.c| 5 ++---
> drivers/mxc/hantro_845/hantrodec_845s.c | 5 ++---
> drivers/mxc/hantro_845_h1/hx280enc.c | 5 ++---
> drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c | 5 ++---
> 4 files changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/mxc/hantro/hantrodec.c b/drivers/mxc/hantro/hantrodec.c
> index e5bff4abec0c..065bdb576da6 100755
> --- a/drivers/mxc/hantro/hantrodec.c
> +++ b/drivers/mxc/hantro/hantrodec.c
> @@ -1291,12 +1291,11 @@ static int put_hantro_core_desc32(struct core_desc
> *kp, struct core_desc_32 __us
> static long hantrodec_ioctl32(struct file *filp, unsigned int cmd, unsigned
> long arg)
> {
> #define HANTRO_IOCTL32(err, filp, cmd, arg) { \
> - mm_segment_t old_fs = get_fs(); \
> - set_fs(KERNEL_DS); \
> + mm_segment_t old_fs = force_uaccess_begin(); \
> err = hantrodec_ioctl(filp, cmd, arg); \
> if (err) \
> return err; \
> - set_fs(old_fs); \
> + force_uaccess_end(old_fs); \
> }
>
> union {
> diff --git a/drivers/mxc/hantro_845/hantrodec_845s.c
> b/drivers/mxc/hantro_845/hantrodec_845s.c
> index b398a3f57715..20443e454306 100755
> --- a/drivers/mxc/hantro_845/hantrodec_845s.c
> +++ b/drivers/mxc/hantro_845/hantrodec_845s.c
> @@ -1421,12 +1421,11 @@ static int put_hantro_core_desc32(struct core_desc
> *kp, struct core_desc_32 __us
> static long hantrodec_ioctl32(struct file *filp, unsigned int cmd, unsigned
> long arg)
> {
> #define HANTRO_IOCTL32(err, filp, cmd, arg) { \
> - mm_segment_t old_fs = get_fs(); \
> - set_fs(KERNEL_DS); \
> + mm_segment_t old_fs = force_uaccess_begin(); \
> err = hantrodec_ioctl(filp, cmd, arg); \
> if (err) \
> return err; \
> - set_fs(old_fs); \
> + force_uaccess_end(old_fs); \
> }
>
> union {
> diff --git a/drivers/mxc/hantro_845_h1/hx280enc.c
> b/drivers/mxc/hantro_845_h1/hx280enc.c
> index 3a403e8029e0..edf2ef2fc56d 100755
> --- a/drivers/mxc/hantro_845_h1/hx280enc.c
> +++ b/drivers/mxc/hantro_845_h1/hx280enc.c
> @@ -483,12 +483,11 @@ static long hx280enc_ioctl32(struct file *filp,
> unsigned int cmd, unsigned long
> {
> long err = 0;
> #define HX280ENC_IOCTL32(err, filp, cmd, arg) { \
> - mm_segment_t old_fs = get_fs(); \
> - set_fs(KERNEL_DS); \
> + mm_segment_t old_fs = force_uaccess_begin(); \
> err = hx280enc_ioctl(filp, cmd, arg); \
> if (err) \
> return err; \
> - set_fs(old_fs); \
> + force_uaccess_end(old_fs); \
> }
>
> union {
> diff --git a/drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c
> b/drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c
> index 3a5083ed6833..bc8300307859 100755
> --- a/drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c
> +++ b/drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c
> @@ -632,12 +632,11 @@ static long hantroenc_ioctl32(struct file *filp,
> unsigned int cmd, unsigned long
> long err = 0;
>
> #define HX280ENC_IOCTL32(err, filp, cmd, arg) { \
> - mm_segment_t old_fs = get_fs(); \
> - set_fs(KERNEL_DS); \
> + mm_segment_t old_fs = force_uaccess_begin(); \
> err = hantroenc_ioctl(filp, cmd, arg); \
> if (err) \
> return err; \
> - set_fs(old_fs); \
> + force_uaccess_end(old_fs); \
> }
>
> union {
> --
> 2.39.0
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12112):
https://lists.yoctoproject.org/g/linux-yocto/message/12112
Mute This Topic: https://lists.yoctoproject.org/mt/96303261/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-