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

Commit 0e9b1039 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "17 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  nilfs2: convert to SPDX license tags
  drivers/dax/device.c: convert variable to vm_fault_t type
  lib/Kconfig.debug: fix three typos in help text
  checkpatch: add __ro_after_init to known $Attribute
  mm: fix BUG_ON() in vmf_insert_pfn_pud() from VM_MIXEDMAP removal
  uapi/linux/keyctl.h: don't use C++ reserved keyword as a struct member name
  memory_hotplug: fix kernel_panic on offline page processing
  checkpatch: add optional static const to blank line declarations test
  ipc/shm: properly return EIDRM in shm_lock()
  mm/hugetlb: filter out hugetlb pages if HUGEPAGE migration is not supported.
  mm/util.c: improve kvfree() kerneldoc
  tools/vm/page-types.c: fix "defined but not used" warning
  tools/vm/slabinfo.c: fix sign-compare warning
  kmemleak: always register debugfs file
  mm: respect arch_dup_mmap() return value
  mm, oom: fix missing tlb_finish_mmu() in __oom_reap_task_mm().
  mm: memcontrol: print proper OOM header when no eligible victim left
parents 28619527 ae98043f

drivers/base/memory.c

+9 −11
Original line number Diff line number Diff line
@@ -416,26 +416,24 @@ static ssize_t show_valid_zones(struct device *dev, 
	struct zone *default_zone;

	int nid;



	/*

	 * Check the existing zone. Make sure that we do that only on the

	 * online nodes otherwise the page_zone is not reliable

	 */

	if (mem->state == MEM_ONLINE) {

		/*

		 * The block contains more than one zone can not be offlined.

		 * This can happen e.g. for ZONE_DMA and ZONE_DMA32

		 */

	if (!test_pages_in_a_zone(start_pfn, start_pfn + nr_pages, &valid_start_pfn, &valid_end_pfn))

		if (!test_pages_in_a_zone(start_pfn, start_pfn + nr_pages,

					  &valid_start_pfn, &valid_end_pfn))

			return sprintf(buf, "none\n");



		start_pfn = valid_start_pfn;

	nr_pages = valid_end_pfn - start_pfn;



	/*

	 * Check the existing zone. Make sure that we do that only on the

	 * online nodes otherwise the page_zone is not reliable

	 */

	if (mem->state == MEM_ONLINE) {

		strcat(buf, page_zone(pfn_to_page(start_pfn))->name);

		goto out;

	}



	nid = pfn_to_nid(start_pfn);

	nid = mem->nid;

	default_zone = zone_for_pfn_range(MMOP_ONLINE_KEEP, nid, start_pfn, nr_pages);

	strcat(buf, default_zone->name);

drivers/dax/device.c

+2 −1
Original line number Diff line number Diff line
@@ -392,7 +392,8 @@ static vm_fault_t dev_dax_huge_fault(struct vm_fault *vmf, 
{

	struct file *filp = vmf->vma->vm_file;

	unsigned long fault_size;

	int rc, id;

	vm_fault_t rc = VM_FAULT_SIGBUS;

	int id;

	pfn_t pfn;

	struct dev_dax *dev_dax = filp->private_data;

fs/nilfs2/alloc.c

+1 −10
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * alloc.c - NILFS dat/inode allocator

 *

 * Copyright (C) 2006-2008 Nippon Telegraph and Telephone Corporation.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * Originally written by Koji Sato.

 * Two allocators were unified by Ryusuke Konishi and Amagai Yoshiji.

 */

fs/nilfs2/alloc.h

+1 −10
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/*

 * alloc.h - persistent object (dat entry/disk inode) allocator/deallocator

 *

 * Copyright (C) 2006-2008 Nippon Telegraph and Telephone Corporation.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * Originally written by Koji Sato.

 * Two allocators were unified by Ryusuke Konishi and Amagai Yoshiji.

 */

fs/nilfs2/bmap.c

+1 −10
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * bmap.c - NILFS block mapping.

 *

 * Copyright (C) 2006-2008 Nippon Telegraph and Telephone Corporation.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * Written by Koji Sato.

 */