diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /arch/arm64/mm/numa.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'arch/arm64/mm/numa.c')
| -rw-r--r-- | arch/arm64/mm/numa.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c index c7fe3ec70774..5bb15eab6f00 100644 --- a/arch/arm64/mm/numa.c +++ b/arch/arm64/mm/numa.c | |||
| @@ -23,6 +23,8 @@ | |||
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/of.h> | 24 | #include <linux/of.h> |
| 25 | 25 | ||
| 26 | #include <asm/acpi.h> | ||
| 27 | |||
| 26 | struct pglist_data *node_data[MAX_NUMNODES] __read_mostly; | 28 | struct pglist_data *node_data[MAX_NUMNODES] __read_mostly; |
| 27 | EXPORT_SYMBOL(node_data); | 29 | EXPORT_SYMBOL(node_data); |
| 28 | nodemask_t numa_nodes_parsed __initdata; | 30 | nodemask_t numa_nodes_parsed __initdata; |