diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-13 14:44:50 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-13 14:44:50 +0200 |
| commit | e4174ff78b9ec2179faeffe66640dbddce52b449 (patch) | |
| tree | b92eecd95872a5bd0d175892822be1476740f214 /include/acpi | |
| parent | Merge branches 'acpi-video', 'acpi-battery', 'acpi-config' and 'acpi-scan' (diff) | |
| parent | docs: mm: numaperf.rst Add brief description for access class 1. (diff) | |
| download | linux-e4174ff78b9ec2179faeffe66640dbddce52b449.tar.xz linux-e4174ff78b9ec2179faeffe66640dbddce52b449.zip | |
Merge branch 'acpi-numa'
* acpi-numa:
docs: mm: numaperf.rst Add brief description for access class 1.
node: Add access1 class to represent CPU to memory characteristics
ACPI: HMAT: Fix handling of changes from ACPI 6.2 to ACPI 6.3
ACPI: Let ACPI know we support Generic Initiator Affinity Structures
x86: Support Generic Initiator only proximity domains
ACPI: Support Generic Initiator only domains
ACPI / NUMA: Add stub function for pxm_to_node()
irq-chip/gic-v3-its: Fix crash if ITS is in a proximity domain without processor or memory
ACPI: Remove side effect of partly creating a node in acpi_get_node()
ACPI: Rename acpi_map_pxm_to_online_node() to pxm_to_online_node()
ACPI: Remove side effect of partly creating a node in acpi_map_pxm_to_online_node()
ACPI: Do not create new NUMA domains from ACPI static tables that are not SRAT
ACPI: Add out of bounds and numa_off protections to pxm_to_node()
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_numa.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h index fdebcfc6c8df..09eb3bc20ff5 100644 --- a/include/acpi/acpi_numa.h +++ b/include/acpi/acpi_numa.h @@ -22,5 +22,10 @@ extern int acpi_numa __initdata; extern void bad_srat(void); extern int srat_disabled(void); +#else /* CONFIG_ACPI_NUMA */ +static inline int pxm_to_node(int pxm) +{ + return 0; +} #endif /* CONFIG_ACPI_NUMA */ #endif /* __ACP_NUMA_H */ |