diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-13 09:15:58 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-13 15:21:35 +0800 |
| commit | 438628396ca8a44f6b710a73612939bc54633d7c (patch) | |
| tree | bf318740f48ff4699cd0154e900507597dae835e /arch/arm64/include | |
| parent | 5afe132e300375c685e60d80d6e5e6a822d216d6 (diff) | |
| parent | 0d590a1ecd1ad44b2dae2bcdc5a6cb24a7080489 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Remove cpuinfo_arm64/cpuinfo_store_cpu() that comes from commit
42b34c73ae40(used for stable kernel only), since we have
newer commit 5aa9ef6f286.
Conflicts:
arch/arm64/include/asm/cputype.h
arch/arm64/kernel/setup.c
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/cputype.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h index 39636a426c56..8fa193a22348 100644 --- a/arch/arm64/include/asm/cputype.h +++ b/arch/arm64/include/asm/cputype.h @@ -114,6 +114,7 @@ static inline bool id_aa64mmfr0_mixed_endian_el0(u64 mmfr0) return (ID_AA64MMFR0_BIGEND(mmfr0) == 0x1) || (ID_AA64MMFR0_BIGENDEL0(mmfr0) == 0x1); } + #endif /* __ASSEMBLY__ */ #endif |