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

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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "16 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  kasan: fix memory hotplug during boot
  kasan: free allocated shadow memory on MEM_CANCEL_ONLINE
  checkpatch: fix macro argument precedence test
  init/main.c: include <linux/mem_encrypt.h>
  kernel/sys.c: fix potential Spectre v1 issue
  mm/memory_hotplug: fix leftover use of struct page during hotplug
  proc: fix smaps and meminfo alignment
  mm: do not warn on offline nodes unless the specific node is explicitly requested
  mm, memory_hotplug: make has_unmovable_pages more robust
  mm/kasan: don't vfree() nonexistent vm_area
  MAINTAINERS: change hugetlbfs maintainer and update files
  ipc/shm: fix shmat() nil address after round-down when remapping
  Revert "ipc/shm: Fix shmat mmap nil-page protection"
  idr: fix invalid ptr dereference on item delete
  ocfs2: revert "ocfs2/o2hb: check len for bio_add_page() to avoid getting incorrect bio"
  mm: fix nr_rotate_swap leak in swapon() error case
parents 03250e10 3f195972

MAINTAINERS

+7 −1
Original line number Diff line number Diff line
@@ -6503,9 +6503,15 @@ F: Documentation/networking/hinic.txt 
F:	drivers/net/ethernet/huawei/hinic/



HUGETLB FILESYSTEM

M:	Nadia Yvette Chambers <nyc@holomorphy.com>

M:	Mike Kravetz <mike.kravetz@oracle.com>

L:	linux-mm@kvack.org

S:	Maintained

F:	fs/hugetlbfs/

F:	mm/hugetlb.c

F:	include/linux/hugetlb.h

F:	Documentation/admin-guide/mm/hugetlbpage.rst

F:	Documentation/vm/hugetlbfs_reserv.rst

F:	Documentation/ABI/testing/sysfs-kernel-mm-hugepages



HVA ST MEDIA DRIVER

M:	Jean-Christophe Trotin <jean-christophe.trotin@st.com>

drivers/base/node.c

+3 −2
Original line number Diff line number Diff line
@@ -490,7 +490,8 @@ int unregister_mem_sect_under_nodes(struct memory_block *mem_blk, 
	return 0;

}



int link_mem_sections(int nid, unsigned long start_pfn, unsigned long nr_pages)

int link_mem_sections(int nid, unsigned long start_pfn, unsigned long nr_pages,

		      bool check_nid)

{

	unsigned long end_pfn = start_pfn + nr_pages;

	unsigned long pfn;
@@ -514,7 +515,7 @@ int link_mem_sections(int nid, unsigned long start_pfn, unsigned long nr_pages) 


		mem_blk = find_memory_block_hinted(mem_sect, mem_blk);



		ret = register_mem_sect_under_node(mem_blk, nid, true);

		ret = register_mem_sect_under_node(mem_blk, nid, check_nid);

		if (!err)

			err = ret;

fs/ocfs2/cluster/heartbeat.c

+1 −10
Original line number Diff line number Diff line
@@ -570,16 +570,7 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg, 
		     current_page, vec_len, vec_start);



		len = bio_add_page(bio, page, vec_len, vec_start);

		if (len != vec_len) {

			mlog(ML_ERROR, "Adding page[%d] to bio failed, "

			     "page %p, len %d, vec_len %u, vec_start %u, "

			     "bi_sector %llu\n", current_page, page, len,

			     vec_len, vec_start,

			     (unsigned long long)bio->bi_iter.bi_sector);

			bio_put(bio);

			bio = ERR_PTR(-EIO);

			return bio;

		}

		if (len != vec_len) break;



		cs += vec_len / (PAGE_SIZE/spp);

		vec_start = 0;

fs/seq_file.c

+0 −5
Original line number Diff line number Diff line
@@ -709,11 +709,6 @@ void seq_put_decimal_ull_width(struct seq_file *m, const char *delimiter, 
	if (m->count + width >= m->size)

		goto overflow;



	if (num < 10) {

		m->buf[m->count++] = num + '0';

		return;

	}



	len = num_to_str(m->buf + m->count, m->size - m->count, num, width);

	if (!len)

		goto overflow;

include/linux/gfp.h

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ static inline struct page * 
__alloc_pages_node(int nid, gfp_t gfp_mask, unsigned int order)

{

	VM_BUG_ON(nid < 0 || nid >= MAX_NUMNODES);

	VM_WARN_ON(!node_online(nid));

	VM_WARN_ON((gfp_mask & __GFP_THISNODE) && !node_online(nid));



	return __alloc_pages(gfp_mask, order, nid);

}