From 332efa4adbb90f2e335a405504fdfa6c1469701e Mon Sep 17 00:00:00 2001
From: Alex Shi <alex.shi@linaro.org>
Date: Thu, 23 Feb 2017 12:52:14 +0800
Subject: [PATCH] arm64/uao: fix compiler warning

Adding a 'return 0' to fix a compiler warning

arch/arm64/mm/fault.c: In function 'cpu_enable_uao':
arch/arm64/mm/fault.c:689:1: warning: control reaches end of non-void
function [-Wreturn-type]

That was introduced by a conflict fix.

Signed-off-by: Alex Shi <alex.shi@linaro.org>
---
 arch/arm64/mm/fault.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 18e5a2c3d554..100204bb9678 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -667,5 +667,6 @@ int cpu_enable_pan(void *__unused)
 int cpu_enable_uao(void *__unused)
 {
 	asm(SET_PSTATE_UAO(1));
+	return 0;
 }
 #endif /* CONFIG_ARM64_UAO */
-- 
2.34.1