Merge remote-tracking branch 'xfs/for-next'

[karo-tx-linux.git] / arch / arm64 / include / asm / cpu.h

diff --git a/arch/arm64/include/asm/cpu.h b/arch/arm64/include/asm/cpu.h
index 30db691b0b7e8c8932d176df14fdcba18d8ceadb..b5e9cee4b5f81a3498a67b934dc9157e2d4cf45b 100644 (file)
--- a/arch/arm64/include/asm/cpu.h
+++ b/arch/arm64/include/asm/cpu.h
@@ -63,6 +63,8 @@ DECLARE_PER_CPU(struct cpuinfo_arm64, cpu_data);
 void cpuinfo_store_cpu(void);
 void __init cpuinfo_store_boot_cpu(void);
 
-void update_cpu_features(struct cpuinfo_arm64 *info);
+void __init init_cpu_features(struct cpuinfo_arm64 *info);
+void update_cpu_features(int cpu, struct cpuinfo_arm64 *info,
+                                struct cpuinfo_arm64 *boot);
 
 #endif /* __ASM_CPU_H */