git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'leds_for_4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewsk...
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
kernel
/
cpufeature.c
diff --git
a/arch/arm64/kernel/cpufeature.c
b/arch/arm64/kernel/cpufeature.c
index 811773d1c1d015ca8e47239f5375d3ced3c04b48..916d27ad79c1d2752023b489618615ac360b45c4 100644
(file)
--- a/
arch/arm64/kernel/cpufeature.c
+++ b/
arch/arm64/kernel/cpufeature.c
@@
-913,8
+913,7
@@
void update_cpu_capabilities(const struct arm64_cpu_capabilities *caps,
* Run through the enabled capabilities and enable() it on all active
* CPUs
*/
* Run through the enabled capabilities and enable() it on all active
* CPUs
*/
-static void __init
-enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps)
+void __init enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps)
{
for (; caps->matches; caps++)
if (caps->enable && cpus_have_cap(caps->capability))
{
for (; caps->matches; caps++)
if (caps->enable && cpus_have_cap(caps->capability))
@@
-1036,6
+1035,7
@@
void __init setup_cpu_features(void)
/* Set the CPU feature capabilies */
setup_feature_capabilities();
/* Set the CPU feature capabilies */
setup_feature_capabilities();
+ enable_errata_workarounds();
setup_elf_hwcaps(arm64_elf_hwcaps);
if (system_supports_32bit_el0())
setup_elf_hwcaps(arm64_elf_hwcaps);
if (system_supports_32bit_el0())