Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b92d9648 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Will Deacon:
 "Three arm64 fixes for -rc3.  They're all pretty straightforward: a
  couple of NUMA issues from the Huawei folks and a thinko in
  __page_to_voff that seems to be benign, but is certainly better off
  fixed.

  Summary:
   - couple of NUMA fixes
   - thinko in __page_to_voff"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: mm: fix __page_to_voff definition
  arm64/numa: fix incorrect log for memory-less node
  arm64/numa: fix pcpu_cpu_distance() to get correct CPU proximity
parents c38c04c6 3fa72fe9

arch/arm64/include/asm/memory.h

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static inline void *phys_to_virt(phys_addr_t x) 
#define _virt_addr_valid(kaddr)	pfn_valid(__pa(kaddr) >> PAGE_SHIFT)

#else

#define __virt_to_pgoff(kaddr)	(((u64)(kaddr) & ~PAGE_OFFSET) / PAGE_SIZE * sizeof(struct page))

#define __page_to_voff(kaddr)	(((u64)(page) & ~VMEMMAP_START) * PAGE_SIZE / sizeof(struct page))

#define __page_to_voff(page)	(((u64)(page) & ~VMEMMAP_START) * PAGE_SIZE / sizeof(struct page))



#define page_to_virt(page)	((void *)((__page_to_voff(page)) | PAGE_OFFSET))

#define virt_to_page(vaddr)	((struct page *)((__virt_to_pgoff(vaddr)) | VMEMMAP_START))

arch/arm64/mm/numa.c

+6 −3
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static int __init early_cpu_to_node(int cpu) 


static int __init pcpu_cpu_distance(unsigned int from, unsigned int to)

{

	return node_distance(from, to);

	return node_distance(early_cpu_to_node(from), early_cpu_to_node(to));

}



static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size,
@@ -223,8 +223,11 @@ static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn) 
	void *nd;

	int tnid;



	pr_info("Initmem setup node %d [mem %#010Lx-%#010Lx]\n",

		nid, start_pfn << PAGE_SHIFT, (end_pfn << PAGE_SHIFT) - 1);

	if (start_pfn < end_pfn)

		pr_info("Initmem setup node %d [mem %#010Lx-%#010Lx]\n", nid,

			start_pfn << PAGE_SHIFT, (end_pfn << PAGE_SHIFT) - 1);

	else

		pr_info("Initmem setup node %d [<memory-less node>]\n", nid);



	nd_pa = memblock_alloc_try_nid(nd_size, SMP_CACHE_BYTES, nid);

	nd = __va(nd_pa);