commit 04a60e843ba4e6f3ea8f540400f610b057a0b53a
author Linux Build Service Account <lnxbuild@localhost> Tue Oct 23 09:59:34 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Oct 23 09:59:34 2018 -0700
tree 614360559ed0fb5330dd013318f1e4d5729f056e
parent 6351c231aea0de15a810753c5404d61653aea887
parent 0ac3123dc9894fea2e1bbd2c77ecb23bc61fb3b0

Merge "platform: msm_shared: Update the variable's type to uint64_t for kaslr seed"

platform/msm_shared/dev_tree.c

diff --git a/platform/msm_shared/dev_tree.c b/platform/msm_shared/dev_tree.c
index 2df16f0..5ad8faf 100644
--- a/platform/msm_shared/dev_tree.c
+++ b/platform/msm_shared/dev_tree.c
@@ -2003,7 +2003,7 @@
 	int ret = 0;
 	uint32_t offset;
 #if ENABLE_KASLRSEED_SUPPORT
-	uintptr_t kaslrseed;
+	uint64_t kaslrseed;
 #endif
 	uint32_t cmdline_len = 0;
 
@@ -2070,7 +2070,7 @@
 	}
 
 #if ENABLE_KASLRSEED_SUPPORT
-	if (!scm_random(&kaslrseed, sizeof(kaslrseed))) {
+	if (!scm_random((uintptr_t *)&kaslrseed, sizeof(kaslrseed))) {
 		/* Adding Kaslr Seed to the chosen node */
 		ret = fdt_appendprop_u64 (fdt, offset, (const char *)"kaslr-seed", (uint64_t)kaslrseed);
 		if (ret)