diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-03 09:36:44 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-03 09:36:44 +0000 |
| commit | a0d6a47ed69978c84ba8859c3cdbbbd04e79eb2d (patch) | |
| tree | 30cf64632dd0c25fb07c1ab8dd590efa6991f1a3 /arch/arm64/include | |
| parent | 3af2dae32ca1108e47a435eaeec276a1c8289a36 (diff) | |
| parent | 413cb08cebe9fd8107f556eee48b2d40773cacde (diff) | |
Merge tag 'v3.14.34' into linux-linaro-lsk-v3.14
This is the 3.14.34 stable release
Conflicts:
arch/arm64/kernel/setup.c
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/cputype.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h index 27f54a7cc81b..ad08bc71fad8 100644 --- a/arch/arm64/include/asm/cputype.h +++ b/arch/arm64/include/asm/cputype.h @@ -78,6 +78,8 @@ static inline u32 __attribute_const__ read_cpuid_cachetype(void) return read_cpuid(CTR_EL0); } +void cpuinfo_store_cpu(void); + #endif /* __ASSEMBLY__ */ #endif |