diff options
Diffstat (limited to 'arch/arm64/mm/numa.c')
| -rw-r--r-- | arch/arm64/mm/numa.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c index 1def1de..c7fe3ec 100644 --- a/arch/arm64/mm/numa.c +++ b/arch/arm64/mm/numa.c @@ -17,6 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <linux/acpi.h> #include <linux/bootmem.h> #include <linux/memblock.h> #include <linux/module.h> @@ -391,7 +392,9 @@ static int __init dummy_numa_init(void) void __init arm64_numa_init(void) { if (!numa_off) { - if (!numa_init(of_numa_init)) + if (!acpi_disabled && !numa_init(arm64_acpi_numa_init)) + return; + if (acpi_disabled && !numa_init(of_numa_init)) return; } |