Skip to content

Commit 3a785e1

Browse files
Robert Richterrafaeljw
authored andcommitted
ACPI/NUMA: Remove architecture dependent remainings
With the removal of the Itanium architecture [1] the last architecture dependent functions: acpi_numa_slit_init(), acpi_numa_memory_affinity_init() were removed. Remove its remainings in the header files too and make them static. [1] commit cf8e865 ("arch: Remove Itanium (IA-64) architecture") Reviewed-by: Dan Williams <dan.j.williams@intel.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Alison Schofield <alison.schofield@intel.com> Signed-off-by: Robert Richter <rrichter@amd.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent f9f67e5 commit 3a785e1

2 files changed

Lines changed: 2 additions & 19 deletions

File tree

drivers/acpi/numa/srat.c

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -213,13 +213,12 @@ __weak int __init numa_fill_memblks(u64 start, u64 end)
213213
return NUMA_NO_MEMBLK;
214214
}
215215

216-
#if defined(CONFIG_X86) || defined(CONFIG_ARM64) || defined(CONFIG_LOONGARCH)
217216
/*
218217
* Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for
219218
* I/O localities since SRAT does not list them. I/O localities are
220219
* not supported at this point.
221220
*/
222-
void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
221+
static void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
223222
{
224223
int i, j;
225224

@@ -241,11 +240,7 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
241240
}
242241
}
243242

244-
/*
245-
* Default callback for parsing of the Proximity Domain <-> Memory
246-
* Area mappings
247-
*/
248-
int __init
243+
static int __init
249244
acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
250245
{
251246
u64 start, end;
@@ -345,13 +340,6 @@ static int __init acpi_parse_cfmws(union acpi_subtable_headers *header,
345340
(*fake_pxm)++;
346341
return 0;
347342
}
348-
#else
349-
static int __init acpi_parse_cfmws(union acpi_subtable_headers *header,
350-
void *arg, const unsigned long table_end)
351-
{
352-
return 0;
353-
}
354-
#endif /* defined(CONFIG_X86) || defined (CONFIG_ARM64) */
355343

356344
static int __init acpi_parse_slit(struct acpi_table_header *table)
357345
{

include/linux/acpi.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,6 @@ static inline bool acpi_gicc_is_usable(struct acpi_madt_generic_interrupt *gicc)
242242
return gicc->flags & ACPI_MADT_ENABLED;
243243
}
244244

245-
/* the following numa functions are architecture-dependent */
246-
void acpi_numa_slit_init (struct acpi_table_slit *slit);
247-
248245
#if defined(CONFIG_X86) || defined(CONFIG_LOONGARCH)
249246
void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa);
250247
#else
@@ -267,8 +264,6 @@ static inline void
267264
acpi_numa_gicc_affinity_init(struct acpi_srat_gicc_affinity *pa) { }
268265
#endif
269266

270-
int acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma);
271-
272267
#ifndef PHYS_CPUID_INVALID
273268
typedef u32 phys_cpuid_t;
274269
#define PHYS_CPUID_INVALID (phys_cpuid_t)(-1)

0 commit comments

Comments
 (0)