aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2017-02-23 12:52:14 +0800
committerAlex Shi <alex.shi@linaro.org>2017-02-23 12:52:14 +0800
commit332efa4adbb90f2e335a405504fdfa6c1469701e (patch)
tree7a26e217ded32261dd803c4c2e84fef35bf4662a
parent57f53fd801a06aa1bfc6492737d70423ff9d3660 (diff)
arm64/uao: fix compiler warninglsk-v4.4-17.02
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>
-rw-r--r--arch/arm64/mm/fault.c1
1 files changed, 1 insertions, 0 deletions
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 */