fix 4.19 mmc patch

diff --git a/queue-4.19/mmc-block-disable-cmdq-on-the-ioctl-path.patch b/queue-4.19/mmc-block-disable-cmdq-on-the-ioctl-path.patch
index 37ec9f8aad948902fb0be4a3ee522b3b4dde68d0..1f8f458bf28ac50476be4da800a93f4ca3b16119 100644 (file)
--- a/queue-4.19/mmc-block-disable-cmdq-on-the-ioctl-path.patch
+++ b/queue-4.19/mmc-block-disable-cmdq-on-the-ioctl-path.patch
@@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +                      if (ret)
 +                              break;
 +              }
-+              fallthrough;
++              /* fallthrough */
        case MMC_DRV_OP_IOCTL_RPMB:
                idata = mq_rq->drv_op_data;
                for (i = 0, ret = 0; i < mq_rq->ioc_count; i++) {

diff --git a/queue-4.19/perf-llvm-return-enomem-when-asprintf-fails.patch b/queue-4.19/perf-llvm-return-enomem-when-asprintf-fails.patch
index d0ddb3afce0c91ec7d1ae788e05c27acbcb498a1..da92e95554c216b6341b7cd746e6750a8b97678f 100644 (file)
--- a/queue-4.19/perf-llvm-return-enomem-when-asprintf-fails.patch
+++ b/queue-4.19/perf-llvm-return-enomem-when-asprintf-fails.patch
@@ -29,14 +29,12 @@ Link: http://lore.kernel.org/lkml/20210609115945.2193194-1-chengzhihao1@huawei.c
 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- tools/perf/util/llvm-utils.c | 2 ++
+ tools/perf/util/llvm-utils.c |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/tools/perf/util/llvm-utils.c b/tools/perf/util/llvm-utils.c
-index 2344d86cd778..46ec9a1bb94c 100644
 --- a/tools/perf/util/llvm-utils.c
 +++ b/tools/perf/util/llvm-utils.c
-@@ -500,6 +500,7 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf,
+@@ -500,6 +500,7 @@ int llvm__compile_bpf(const char *path,
                        goto errout;
                }
  
@@ -44,7 +42,7 @@ index 2344d86cd778..46ec9a1bb94c 100644
                if (asprintf(&pipe_template, "%s -emit-llvm | %s -march=bpf %s -filetype=obj -o -",
                              template, llc_path, opts) < 0) {
                        pr_err("ERROR:\tnot enough memory to setup command line\n");
-@@ -520,6 +521,7 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf,
+@@ -520,6 +521,7 @@ int llvm__compile_bpf(const char *path,
  
        pr_debug("llvm compiling command template: %s\n", template);
  
@@ -52,6 +50,3 @@ index 2344d86cd778..46ec9a1bb94c 100644
        if (asprintf(&command_echo, "echo -n \"%s\"", template) < 0)
                goto errout;
  
--- 
-2.30.2
-