Merge tag 'LA.UM.8.4.r1-05500-8x98.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4 into lineage-17.1-caf-msm8998

* tag 'LA.UM.8.4.r1-05500-8x98.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4:
  ARM: convert to generated system call tables
  ARM: remove indirection of asm/mach-types.h
  mm/zsmalloc.c: change stat type parameter to int
  msm: sde: fix mem access of sde rotator regdma ram
  soc: qcom: Fix strlcpy compilation error with clang
  sysmon-qmi: Fix compilation error while using LLVM
  mm/zsmalloc.c: fix -Wunneeded-internal-declaration warning
  sched/sysctl: Fix attributes of some extern declarations
  ion: Fix typecasting of msm_ion_heap_types
  soc: qcom: glink_debugfs: Fix compilation error with clang
  msm: ipa3: Fix compilation errors after enabling LLVM
  msm: ipa: Fix assignment warning with clang
  mmc: host: sdhci-msm-ice: Fix clang warning with NOT operator usage
  driver : Fix warnings and errors with llvm
  soc: qcom: access smp2p_smem structure with I/O function
  Makefile: Disable undefined-optimized and tautological features
  ANDROID_BUILD_TOP is deprecated.
  AndroidKernel: Update the LLVM path
  AndroidKernel: Add configuration for the LLVM path
  AndroidKernel: Add LLVM support for Kernel
  drivers: hwmon: Fix compilation errors in ADC for kernel 4.9
  msm: camera: Fix warnings and errors with llvm
  f_qc_rndis: Remove unused structure
  crypto: qcedev: Fix out of memory issue
  crypto: msm: update QTI crypto drivers for msm-4.4
  fbdev: msm: wait for frame complete before triggering dma cmd
  msm: mdss: hdmi: don't reset CEC while triggering message send
  fbdev: msm: Fix race condition during te_irq calls
  msm: camera: Fix OOB issue in IR CUT driver

Change-Id: Ib371d4baa8840eabda4bd825d3abcd86e79d5c7a

3 files changed, 6 insertions, 5 deletions

diff --git a/drivers/platform/msm/ipa/ipa_v2/rmnet_ipa.c b/drivers/platform/msm/ipa/ipa_v2/rmnet_ipa.c
index 6236c9385d91..79515ba637ee 100644
--- a/drivers/platform/msm/ipa/ipa_v2/rmnet_ipa.c
+++ b/drivers/platform/msm/ipa/ipa_v2/rmnet_ipa.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
diff --git a/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c b/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c
index 94f30de88743..b0f1e5657410 100644
--- a/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c
+++ b/drivers/platform/msm/ipa/ipa_v3/ipa_rt.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -1243,7 +1243,7 @@ int ipa3_add_rt_rule_after(struct ipa_ioc_add_rt_rule_after *rules)
 	tbl = __ipa3_find_rt_tbl(rules->ip, rules->rt_tbl_name);
 	if (tbl == NULL || (tbl->cookie != IPA_RT_TBL_COOKIE)) {
 		IPAERR_RL("failed finding rt tbl name = %s\n",
-			rules->rt_tbl_name ? rules->rt_tbl_name : "");
+			(rules->rt_tbl_name != NULL) ? rules->rt_tbl_name : "");
 		ret = -EINVAL;
 		goto bail;
 	}
diff --git a/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c b/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
index cccd597646a7..3392cd0413a9 100644
--- a/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
+++ b/drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -722,7 +722,8 @@ static int ipa3_wwan_add_ul_flt_rule_to_ipa(void)
 		retval = -EFAULT;
 	}
 
-	req->install_status = QMI_RESULT_SUCCESS_V01;
+	req->install_status = (enum ipa_qmi_result_type_v01)
+						IPA_QMI_RESULT_SUCCESS_V01;
 	req->rule_id_valid = 1;
 	req->rule_id_len = rmnet_ipa3_ctx->num_q6_rules;
 	for (i = 0; i < rmnet_ipa3_ctx->num_q6_rules; i++) {