aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2017-01-10 17:18:20 +0000
committerJon Medhurst <tixy@linaro.org>2017-01-10 17:23:13 +0000
commitd20ddef315a3f1b752976d25d0d91215f8caa736 (patch)
tree3540e248e52aa4be191a9112b534df73d87e6698 /arch
parent64eb37a047b24326f9d4be75c2b98441a66aae94 (diff)
HACK: arm64: Fix warning in cpu_enable_uao
Commit a057484ab40f introduced this compiler warning: arch/arm64/mm/fault.c: In function 'cpu_enable_uao': arch/arm64/mm/fault.c:690:1: warning: control reaches end of non-void function [-Wreturn-type] Silence this and make things consistant at runtime by returning zero. Note, this hack should be both safe and temporary because this function is being removed from mainline linux [1] as "Since its introduction, the UAO enable call was broken, and useless." [1] https://www.spinics.net/lists/arm-kernel/msg552881.html
Diffstat (limited to 'arch')
-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 380e02941691..25547993a5ea 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -686,5 +686,6 @@ int cpu_enable_pan(void *__unused)
int cpu_enable_uao(void *__unused)
{
asm(SET_PSTATE_UAO(1));
+ return 0;
}
#endif /* CONFIG_ARM64_UAO */