Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fixes from Catalin Marinas:

 - Fix tegra194-cpufreq module build failure caused by __cpu_logical_map
   not being exported.

 - Improve fixed_addresses comment regarding the fixmap buffer sizes.

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: Fix __cpu_logical_map undefined issue
  arm64/fixmap: make notes of fixed_addresses more precisely

diff --cc arch/arm64/include/asm/smp.h
Simple merge

diff --cc arch/arm64/kernel/setup.c
index 87e81d2,457652d..77c4c9b
--- 1/arch/arm64/kernel/setup.c
--- 2/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@@ -276,7 -276,13 +276,13 @@@ arch_initcall(reserve_memblock_reserved
  
  u64 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = INVALID_HWID };
  
 -void __init setup_arch(char **cmdline_p)
+ u64 cpu_logical_map(int cpu)
+ {
+       return __cpu_logical_map[cpu];
+ }
+ EXPORT_SYMBOL_GPL(cpu_logical_map);
+ 
 +void __init __no_sanitize_address setup_arch(char **cmdline_p)
  {
        init_mm.start_code = (unsigned long) _text;
        init_mm.end_code   = (unsigned long) _etext;

diff --cc arch/arm64/kernel/smp.c
Simple merge