OSDN Git Service

arm64: kernel: Fix build warning
authorLuca Stefani <luca.stefani.ge1@gmail.com>
Fri, 13 Jan 2017 15:09:57 +0000 (16:09 +0100)
committerLuca Stefani <luca.stefani.ge1@gmail.com>
Fri, 13 Jan 2017 15:36:41 +0000 (16:36 +0100)
* Issue: After da643dc .enable expects an int
  -> Change cpu_enable_uao protype to int

Change-Id: I581a1afd13cd90637e6a7a315ede2af8950b401f
Signed-off-by: Luca Stefani <luca.stefani.ge1@gmail.com>
arch/arm64/include/asm/processor.h
arch/arm64/mm/fault.c

index 83d0aa9..4be934f 100644 (file)
@@ -191,6 +191,6 @@ static inline void spin_lock_prefetch(const void *ptr)
 #endif
 
 int cpu_enable_pan(void *__unused);
-void cpu_enable_uao(void *__unused);
+int cpu_enable_uao(void *__unused);
 
 #endif /* __ASM_PROCESSOR_H */
index 2c0a80c..2581ede 100644 (file)
@@ -658,8 +658,9 @@ int cpu_enable_pan(void *__unused)
  * We need to enable the feature at runtime (instead of adding it to
  * PSR_MODE_EL1h) as the feature may not be implemented by the cpu.
  */
-void cpu_enable_uao(void *__unused)
+int cpu_enable_uao(void *__unused)
 {
        asm(SET_PSTATE_UAO(1));
+       return 0;
 }
 #endif /* CONFIG_ARM64_UAO */