Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 770ba060 authored by Yury Norov's avatar Yury Norov Committed by Will Deacon
Browse files

arm64: cpu_ops: Add missing 'const' qualifiers 



Building the kernel with an LTO-enabled GCC spits out the following "const"
warning for the cpu_ops code:

  mm/percpu.c:2168:20: error: pcpu_fc_names causes a section type conflict
  with dt_supported_cpu_ops
  const char * const pcpu_fc_names[PCPU_FC_NR] __initconst = {
          ^
  arch/arm64/kernel/cpu_ops.c:34:37: note: ‘dt_supported_cpu_ops’ was declared here
  static const struct cpu_operations *dt_supported_cpu_ops[] __initconst = {

Fix it by adding missed const qualifiers.

Signed-off-by: default avatarYury Norov <ynorov@caviumnetworks.com>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent f8ada189

arch/arm64/kernel/cpu_ops.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -31,13 +31,13 @@ extern const struct cpu_operations cpu_psci_ops; 




const struct cpu_operations *cpu_ops[NR_CPUS] __ro_after_init;

const struct cpu_operations *cpu_ops[NR_CPUS] __ro_after_init;





static const struct cpu_operations *dt_supported_cpu_ops[] __initconst = {

static const struct cpu_operations *const dt_supported_cpu_ops[] __initconst = {

	&smp_spin_table_ops,

	&smp_spin_table_ops,

	&cpu_psci_ops,

	&cpu_psci_ops,

	NULL,

	NULL,

};

};





static const struct cpu_operations *acpi_supported_cpu_ops[] __initconst = {

static const struct cpu_operations *const acpi_supported_cpu_ops[] __initconst = {

#ifdef CONFIG_ARM64_ACPI_PARKING_PROTOCOL

#ifdef CONFIG_ARM64_ACPI_PARKING_PROTOCOL

	&acpi_parking_protocol_ops,

	&acpi_parking_protocol_ops,

#endif

#endif
@@ -47,7 +47,7 @@ static const struct cpu_operations *acpi_supported_cpu_ops[] __initconst = { 




static const struct cpu_operations * __init cpu_get_ops(const char *name)

static const struct cpu_operations * __init cpu_get_ops(const char *name)

{

{

	const struct cpu_operations **ops;

	const struct cpu_operations *const *ops;





	ops = acpi_disabled ? dt_supported_cpu_ops : acpi_supported_cpu_ops;

	ops = acpi_disabled ? dt_supported_cpu_ops : acpi_supported_cpu_ops;