diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-18 11:12:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-18 11:12:53 -0800 |
| commit | 1bbb05f52055c8b2fc1cbb2ac272b011593172f9 (patch) | |
| tree | b827d1c157b969a3fc7aa58d68bcfac1e400415b /arch/arm64/mm | |
| parent | 451bb1a6b2d24df6d677fe790950bec0679b741d (diff) | |
| parent | ffc7dc8d838c6403a550021e4f28a737334d80a7 (diff) | |
| download | linux-1bbb05f52055c8b2fc1cbb2ac272b011593172f9.tar.gz linux-1bbb05f52055c8b2fc1cbb2ac272b011593172f9.tar.xz | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes and cleanups from Thomas Gleixner:
"This set of updates contains:
- Robustification for the logical package managment. Cures the AMD
and virtualization issues.
- Put the correct start_cpu() return address on the stack of the idle
task.
- Fixups for the fallout of the nodeid <-> cpuid persistent mapping
modifciations
- Move the x86/MPX specific mm_struct member to the arch specific
mm_context where it belongs
- Cleanups for C89 struct initializers and useless function
arguments"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/floppy: Use designated initializers
x86/mpx: Move bd_addr to mm_context_t
x86/mm: Drop unused argument 'removed' from sync_global_pgds()
ACPI/NUMA: Do not map pxm to node when NUMA is turned off
x86/acpi: Use proper macro for invalid node
x86/smpboot: Prevent false positive out of bounds cpumask access warning
x86/boot/64: Push correct start_cpu() return address
x86/boot/64: Use 'push' instead of 'call' in start_cpu()
x86/smpboot: Make logical package management more robust
Diffstat (limited to 'arch/arm64/mm')
| -rw-r--r-- | arch/arm64/mm/numa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c index 4b32168cf91a..b388a99fea7b 100644 --- a/arch/arm64/mm/numa.c +++ b/arch/arm64/mm/numa.c @@ -35,7 +35,7 @@ static int cpu_to_node_map[NR_CPUS] = { [0 ... NR_CPUS-1] = NUMA_NO_NODE }; static int numa_distance_cnt; static u8 *numa_distance; -static bool numa_off; +bool numa_off; static __init int numa_parse_early_param(char *opt) { |