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

Commit 6531e115 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "11 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  scripts/spdxcheck.py: always open files in binary mode
  checkstack.pl: fix for aarch64
  userfaultfd: check VM_MAYWRITE was set after verifying the uffd is registered
  fs/iomap.c: get/put the page in iomap_page_create/release()
  hugetlbfs: call VM_BUG_ON_PAGE earlier in free_huge_page()
  memblock: annotate memblock_is_reserved() with __init_memblock
  psi: fix reference to kernel commandline enable
  arch/sh/include/asm/io.h: provide prototypes for PCI I/O mapping in asm/io.h
  mm/sparse: add common helper to mark all memblocks present
  mm: introduce common STRUCT_PAGE_MAX_SHIFT define
  alpha: fix hang caused by the bootmem removal
parents 380ef2c9 3a6ab5c7

arch/alpha/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -634,6 +634,7 @@ setup_arch(char **cmdline_p) 


	/* Find our memory.  */

	setup_memory(kernel_end);

	memblock_set_bottom_up(true);



	/* First guess at cpu cache sizes.  Do this before init_arch.  */

	determine_cpu_caches(cpu->type);

arch/alpha/mm/numa.c

+3 −3
Original line number Diff line number Diff line
@@ -144,14 +144,14 @@ setup_memory_node(int nid, void *kernel_end) 
	if (!nid && (node_max_pfn < end_kernel_pfn || node_min_pfn > start_kernel_pfn))

		panic("kernel loaded out of ram");



	memblock_add(PFN_PHYS(node_min_pfn),

		     (node_max_pfn - node_min_pfn) << PAGE_SHIFT);



	/* Zone start phys-addr must be 2^(MAX_ORDER-1) aligned.

	   Note that we round this down, not up - node memory

	   has much larger alignment than 8Mb, so it's safe. */

	node_min_pfn &= ~((1UL << (MAX_ORDER-1))-1);



	memblock_add(PFN_PHYS(node_min_pfn),

		     (node_max_pfn - node_min_pfn) << PAGE_SHIFT);



	NODE_DATA(nid)->node_start_pfn = node_min_pfn;

	NODE_DATA(nid)->node_present_pages = node_max_pfn - node_min_pfn;

arch/arm64/include/asm/memory.h

+0 −9
Original line number Diff line number Diff line
@@ -34,15 +34,6 @@ 
 */

#define PCI_IO_SIZE		SZ_16M



/*

 * Log2 of the upper bound of the size of a struct page. Used for sizing

 * the vmemmap region only, does not affect actual memory footprint.

 * We don't use sizeof(struct page) directly since taking its size here

 * requires its definition to be available at this point in the inclusion

 * chain, and it may not be a power of 2 in the first place.

 */

#define STRUCT_PAGE_MAX_SHIFT	6



/*

 * VMEMMAP_SIZE - allows the whole linear region to be covered by

 *                a struct page array

arch/arm64/mm/init.c

+0 −8
Original line number Diff line number Diff line
@@ -610,14 +610,6 @@ void __init mem_init(void) 
	BUILD_BUG_ON(TASK_SIZE_32			> TASK_SIZE_64);

#endif



#ifdef CONFIG_SPARSEMEM_VMEMMAP

	/*

	 * Make sure we chose the upper bound of sizeof(struct page)

	 * correctly when sizing the VMEMMAP array.

	 */

	BUILD_BUG_ON(sizeof(struct page) > (1 << STRUCT_PAGE_MAX_SHIFT));

#endif



	if (PAGE_SIZE >= 16384 && get_num_physpages() <= 128) {

		extern int sysctl_overcommit_memory;

		/*

arch/sh/include/asm/io.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#define __IO_PREFIX     generic

#include <asm/io_generic.h>

#include <asm/io_trapped.h>

#include <asm-generic/pci_iomap.h>

#include <mach/mangle-port.h>



#define __raw_writeb(v,a)	(__chk_io_ptr(a), *(volatile u8  __force *)(a) = (v))