3 files changed, 6 insertions, 13 deletions
diff --git a/net/ipc_router/ipc_router_core.c b/net/ipc_router/ipc_router_core.c
index f3b889419ee..e24f979c1be 100644
--- a/net/ipc_router/ipc_router_core.c
+++ b/net/ipc_router/ipc_router_core.c
@@ -32,11 +32,11 @@
 #include <linux/uaccess.h>
 #include <linux/ipc_router.h>
 #include <linux/ipc_router_xprt.h>
+#include <soc/qcom/subsystem_notif.h>
 
 #include <asm/byteorder.h>
 
-#include <mach/smem_log.h>
-#include <mach/subsystem_notif.h>
+#include <soc/qcom/smem_log.h>
 
 #include "ipc_router_private.h"
 #include "ipc_router_security.h"
@@ -2056,7 +2056,7 @@ static int process_control_msg(struct msm_ipc_router_xprt_info *xprt_info,
 	struct rr_header_v1 *hdr;
 
 	if (pkt->length != sizeof(*msg)) {
-		pr_err("%s: r2r msg size %d != %d\n", __func__, pkt->length,
+		pr_err("%s: r2r msg size %d != %zu\n", __func__, pkt->length,
 			sizeof(*msg));
 		return -EINVAL;
 	}
@@ -2135,8 +2135,7 @@ static void do_read_data(struct work_struct *work)
 			release_pkt(pkt);
 			continue;
 		}
-#if defined(CONFIG_MSM_SMD_LOGGING)
-#if defined(DEBUG)
+
 		if (msm_ipc_router_debug_mask & SMEM_LOG) {
 			smem_log_event((SMEM_LOG_PROC_ID_APPS |
 				SMEM_LOG_IPC_ROUTER_EVENT_BASE |
@@ -2148,8 +2147,6 @@ static void do_read_data(struct work_struct *work)
 				(hdr->type << 24) | (hdr->control_flag << 16) |
 				(hdr->size & 0xffff));
 		}
-#endif
-#endif
 
 		down_read(&local_ports_lock_lha2);
 		port_ptr = msm_ipc_router_lookup_local_port(hdr->dst_port_id);
@@ -2444,8 +2441,6 @@ static int msm_ipc_router_write_pkt(struct msm_ipc_port *src,
 		hdr->control_flag, hdr->size,
 		hdr->dst_node_id, hdr->dst_port_id);
 
-#if defined(CONFIG_MSM_SMD_LOGGING)
-#if defined(DEBUG)
 	if (msm_ipc_router_debug_mask & SMEM_LOG) {
 		smem_log_event((SMEM_LOG_PROC_ID_APPS |
 			SMEM_LOG_IPC_ROUTER_EVENT_BASE |
@@ -2457,8 +2452,6 @@ static int msm_ipc_router_write_pkt(struct msm_ipc_port *src,
 			(hdr->type << 24) | (hdr->control_flag << 16) |
 			(hdr->size & 0xffff));
 	}
-#endif
-#endif
 
 	return hdr->size;
 }
diff --git a/net/ipc_router/ipc_router_security.c b/net/ipc_router/ipc_router_security.c
index 9deab65f925..50db88d0c4e 100644
--- a/net/ipc_router/ipc_router_security.c
+++ b/net/ipc_router/ipc_router_security.c
@@ -118,7 +118,7 @@ int msm_ipc_config_sec_rules(void *arg)
 		return -EINVAL;
 
 	if (sec_rules_arg.num_group_info > (SIZE_MAX / sizeof(gid_t))) {
-		pr_err("%s: Integer Overflow %d * %d\n", __func__,
+		pr_err("%s: Integer Overflow %zu * %d\n", __func__,
 			sizeof(gid_t), sec_rules_arg.num_group_info);
 		return -EINVAL;
 	}
diff --git a/net/ipc_router/ipc_router_socket.c b/net/ipc_router/ipc_router_socket.c
index 979b4832850..ab1b83f1f04 100644
--- a/net/ipc_router/ipc_router_socket.c
+++ b/net/ipc_router/ipc_router_socket.c
@@ -489,7 +489,7 @@ static int msm_ipc_router_ioctl(struct socket *sock,
 		if (server_arg.num_entries_in_array) {
 			if (server_arg.num_entries_in_array >
 				(SIZE_MAX / sizeof(*srv_info))) {
-				pr_err("%s: Integer Overflow %d * %d\n",
+				pr_err("%s: Integer Overflow %zu * %d\n",
 					__func__, sizeof(*srv_info),
 					server_arg.num_entries_in_array);
 				ret = -EINVAL;