Revert "arm64: acpi: Move get_cpu_for_acpi_id() to a header"
This reverts commit 48434a5b6c
.
This commit is contained in:
parent
c016244326
commit
dd167a1c23
2 changed files with 11 additions and 11 deletions
arch/arm64
|
@ -97,17 +97,6 @@ static inline u32 get_acpi_id_for_cpu(unsigned int cpu)
|
||||||
return acpi_cpu_get_madt_gicc(cpu)->uid;
|
return acpi_cpu_get_madt_gicc(cpu)->uid;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int get_cpu_for_acpi_id(u32 uid)
|
|
||||||
{
|
|
||||||
int cpu;
|
|
||||||
|
|
||||||
for (cpu = 0; cpu < nr_cpu_ids; cpu++)
|
|
||||||
if (uid == get_acpi_id_for_cpu(cpu))
|
|
||||||
return cpu;
|
|
||||||
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void arch_fix_phys_package_id(int num, u32 slot) { }
|
static inline void arch_fix_phys_package_id(int num, u32 slot) { }
|
||||||
void __init acpi_init_cpus(void);
|
void __init acpi_init_cpus(void);
|
||||||
int apei_claim_sea(struct pt_regs *regs);
|
int apei_claim_sea(struct pt_regs *regs);
|
||||||
|
|
|
@ -34,6 +34,17 @@ int __init acpi_numa_get_nid(unsigned int cpu)
|
||||||
return acpi_early_node_map[cpu];
|
return acpi_early_node_map[cpu];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline int get_cpu_for_acpi_id(u32 uid)
|
||||||
|
{
|
||||||
|
int cpu;
|
||||||
|
|
||||||
|
for (cpu = 0; cpu < nr_cpu_ids; cpu++)
|
||||||
|
if (uid == get_acpi_id_for_cpu(cpu))
|
||||||
|
return cpu;
|
||||||
|
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
static int __init acpi_parse_gicc_pxm(union acpi_subtable_headers *header,
|
static int __init acpi_parse_gicc_pxm(union acpi_subtable_headers *header,
|
||||||
const unsigned long end)
|
const unsigned long end)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue