diff options
-rw-r--r-- | arch/arm/kernel/topology.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index 85a87370f144..0bc94b1fd1ae 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c | |||
@@ -68,16 +68,16 @@ struct cpu_efficiency { | |||
68 | * Processors that are not defined in the table, | 68 | * Processors that are not defined in the table, |
69 | * use the default SCHED_POWER_SCALE value for cpu_scale. | 69 | * use the default SCHED_POWER_SCALE value for cpu_scale. |
70 | */ | 70 | */ |
71 | struct cpu_efficiency table_efficiency[] = { | 71 | static const struct cpu_efficiency table_efficiency[] = { |
72 | {"arm,cortex-a15", 3891}, | 72 | {"arm,cortex-a15", 3891}, |
73 | {"arm,cortex-a7", 2048}, | 73 | {"arm,cortex-a7", 2048}, |
74 | {NULL, }, | 74 | {NULL, }, |
75 | }; | 75 | }; |
76 | 76 | ||
77 | unsigned long *__cpu_capacity; | 77 | static unsigned long *__cpu_capacity; |
78 | #define cpu_capacity(cpu) __cpu_capacity[cpu] | 78 | #define cpu_capacity(cpu) __cpu_capacity[cpu] |
79 | 79 | ||
80 | unsigned long middle_capacity = 1; | 80 | static unsigned long middle_capacity = 1; |
81 | 81 | ||
82 | /* | 82 | /* |
83 | * Iterate all CPUs' descriptor in DT and compute the efficiency | 83 | * Iterate all CPUs' descriptor in DT and compute the efficiency |
@@ -89,7 +89,7 @@ unsigned long middle_capacity = 1; | |||
89 | */ | 89 | */ |
90 | static void __init parse_dt_topology(void) | 90 | static void __init parse_dt_topology(void) |
91 | { | 91 | { |
92 | struct cpu_efficiency *cpu_eff; | 92 | const struct cpu_efficiency *cpu_eff; |
93 | struct device_node *cn = NULL; | 93 | struct device_node *cn = NULL; |
94 | unsigned long min_capacity = (unsigned long)(-1); | 94 | unsigned long min_capacity = (unsigned long)(-1); |
95 | unsigned long max_capacity = 0; | 95 | unsigned long max_capacity = 0; |
@@ -158,7 +158,7 @@ static void __init parse_dt_topology(void) | |||
158 | * boot. The update of all CPUs is in O(n^2) for heteregeneous system but the | 158 | * boot. The update of all CPUs is in O(n^2) for heteregeneous system but the |
159 | * function returns directly for SMP system. | 159 | * function returns directly for SMP system. |
160 | */ | 160 | */ |
161 | void update_cpu_power(unsigned int cpu) | 161 | static void update_cpu_power(unsigned int cpu) |
162 | { | 162 | { |
163 | if (!cpu_capacity(cpu)) | 163 | if (!cpu_capacity(cpu)) |
164 | return; | 164 | return; |
@@ -185,7 +185,7 @@ const struct cpumask *cpu_coregroup_mask(int cpu) | |||
185 | return &cpu_topology[cpu].core_sibling; | 185 | return &cpu_topology[cpu].core_sibling; |
186 | } | 186 | } |
187 | 187 | ||
188 | void update_siblings_masks(unsigned int cpuid) | 188 | static void update_siblings_masks(unsigned int cpuid) |
189 | { | 189 | { |
190 | struct cputopo_arm *cpu_topo, *cpuid_topo = &cpu_topology[cpuid]; | 190 | struct cputopo_arm *cpu_topo, *cpuid_topo = &cpu_topology[cpuid]; |
191 | int cpu; | 191 | int cpu; |