platform: msm: fix PFT for 64-bit

Fix compile warning for 64-bit platform.

Change-Id: Ie19f331a893f3265eef70e70945e1edd3268c4b0
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>

drivers/md/dm-req-crypt.c

@@ -19,6 +19,7 @@
 #include <linux/mempool.h>
 #include <linux/slab.h>
 #include <linux/crypto.h>
+#include <linux/qcrypto.h>
 #include <linux/workqueue.h>
 #include <linux/backing-dev.h>
 #include <linux/atomic.h>
@@ -27,13 +28,13 @@
 #include <linux/printk.h>
 #include <linux/pft.h>
 
-#include <crypto/scatterwalk.h>
 #include <asm/page.h>
 #include <asm/unaligned.h>
+
+#include <crypto/scatterwalk.h>
 #include <crypto/hash.h>
 #include <crypto/md5.h>
 #include <crypto/algapi.h>
-#include <linux/qcrypto.h>
 
 #define DM_MSG_PREFIX "req-crypt"
 
@@ -592,8 +593,8 @@ static void req_cryptd_crypt(struct work_struct *work)
 		else
 			req_cryptd_crypt_read_plain(io);
 	} else {
-		DMERR("%s received non-write request for Clone %u\n",
-				__func__, (unsigned int)io->cloned_request);
+		DMERR("%s received non-write request for Clone 0x%p\n",
+				__func__, io->cloned_request);
 	}
 }
 

drivers/platform/msm/pft.c

@@ -487,7 +487,7 @@ static int pft_get_file_tag(struct dentry *dentry, u32 *tag_ptr)
 		pft_tag_inode_encrypted(inode, key);
 		*tag_ptr = pft_get_inode_tag(inode);
 	} else {
-		pr_err("getxattr() failure, ret=%d.\n", size);
+		pr_err("getxattr() failure, ret=%zu\n", size);
 		return -EINVAL;
 	}
 
@@ -704,7 +704,7 @@ static struct inode *pft_bio_get_inode(struct bio *bio)
 
 		/* Using direct-io (O_DIRECT) without page cache */
 		inode = dio_bio_get_inode(bio);
-		pr_debug("inode on direct-io, inode = 0x%x.\n", (int) inode);
+		pr_debug("inode on direct-io, inode = 0x%p.\n", inode);
 
 		return inode;
 	}

security/selinux/include/objsec.h

@@ -24,8 +24,7 @@
 #include <linux/binfmts.h>
 #include <linux/in.h>
 #include <linux/spinlock.h>
-#include "flask.h"
-#include "avc.h"
+#include <linux/in6.h>
 
 struct task_security_struct {
 	u32 osid;		/* SID prior to last execve */

security/selinux/netif.c

@@ -28,6 +28,7 @@
 #include "security.h"
 #include "objsec.h"
 #include "netif.h"
+#include "avc.h"
 
 #define SEL_NETIF_HASH_SIZE	64
 #define SEL_NETIF_HASH_MAX	1024

security/selinux/netlabel.c

@@ -40,6 +40,7 @@
 #include "objsec.h"
 #include "security.h"
 #include "netlabel.h"
+#include "avc.h"
 
 /**
  * selinux_netlbl_sidlookup_cached - Cache a SID lookup

security/selinux/netlink.c

@@ -21,6 +21,7 @@
 #include <net/netlink.h>
 
 #include "security.h"
+#include "avc.h"
 
 static struct sock *selnl;
 

security/selinux/netnode.c

@@ -42,6 +42,7 @@
 
 #include "netnode.h"
 #include "objsec.h"
+#include "avc.h"
 
 #define SEL_NETNODE_HASH_SIZE       256
 #define SEL_NETNODE_HASH_BKT_LIMIT   16

security/selinux/netport.c

@@ -41,6 +41,7 @@
 
 #include "netport.h"
 #include "objsec.h"
+#include "avc.h"
 
 #define SEL_NETPORT_HASH_SIZE       256
 #define SEL_NETPORT_HASH_BKT_LIMIT   16