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

Commit 5bc52f64 authored Oct 14, 2019 by Linus Torvalds

Merge branch 'akpm' (patches from Andrew)

Merge more fixes from Andrew Morton:
 "The usual shower of hotfixes and some followups to the recently merged
  page_owner enhancements"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm/memory-failure: poison read receives SIGKILL instead of SIGBUS if mmaped more than once
  mm/slab.c: fix kernel-doc warning for __ksize()
  xarray.h: fix kernel-doc warning
  bitmap.h: fix kernel-doc warning and typo
  fs/fs-writeback.c: fix kernel-doc warning
  fs/libfs.c: fix kernel-doc warning
  fs/direct-io.c: fix kernel-doc warning
  mm, compaction: fix wrong pfn handling in __reset_isolation_pfn()
  mm, hugetlb: allow hugepage allocations to reclaim as needed
  lib/test_meminit: add a kmem_cache_alloc_bulk() test
  mm/slub.c: init_on_free=1 should wipe freelist ptr for bulk allocations
  lib/generic-radix-tree.c: add kmemleak annotations
  mm/slub: fix a deadlock in show_slab_objects()
  mm, page_owner: rename flag indicating that page is allocated
  mm, page_owner: decouple freeing stack trace from debug_pagealloc
  mm, page_owner: fix off-by-one error in __set_page_owner_handle()

parents 2abd839a 3d7fed4a

Documentation/dev-tools/kasan.rst

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,9 @@ smaller binary while the latter is 1.1 - 2 times faster.
	Both KASAN modes work with both SLUB and SLAB memory allocators.		Both KASAN modes work with both SLUB and SLAB memory allocators.
	For better bug detection and nicer reporting, enable CONFIG_STACKTRACE.		For better bug detection and nicer reporting, enable CONFIG_STACKTRACE.

			To augment reports with last allocation and freeing stack of the physical page,
			it is recommended to enable also CONFIG_PAGE_OWNER and boot with page_owner=on.

	To disable instrumentation for specific files or directories, add a line		To disable instrumentation for specific files or directories, add a line
	similar to the following to the respective kernel Makefile:		similar to the following to the respective kernel Makefile:

fs/direct-io.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -241,9 +241,8 @@ void dio_warn_stale_pagecache(struct file *filp)
	}		}
	}		}

	/**		/*
	* dio_complete() - called when all DIO BIO I/O has been completed		* dio_complete() - called when all DIO BIO I/O has been completed
	* @offset: the byte offset in the file of the completed operation
	*		*
	* This drops i_dio_count, lets interested parties know that a DIO operation		* This drops i_dio_count, lets interested parties know that a DIO operation
	* has completed, and calculates the resulting return code for the operation.		* has completed, and calculates the resulting return code for the operation.

fs/fs-writeback.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -905,7 +905,7 @@ static void bdi_split_work_to_wbs(struct backing_dev_info *bdi,
	* cgroup_writeback_by_id - initiate cgroup writeback from bdi and memcg IDs		* cgroup_writeback_by_id - initiate cgroup writeback from bdi and memcg IDs
	* @bdi_id: target bdi id		* @bdi_id: target bdi id
	* @memcg_id: target memcg css id		* @memcg_id: target memcg css id
	* @nr_pages: number of pages to write, 0 for best-effort dirty flushing		* @nr: number of pages to write, 0 for best-effort dirty flushing
	* @reason: reason why some writeback work initiated		* @reason: reason why some writeback work initiated
	* @done: target wb_completion		* @done: target wb_completion
	*		*

fs/libfs.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -473,8 +473,7 @@ EXPORT_SYMBOL(simple_write_begin);

	/**		/**
	* simple_write_end - .write_end helper for non-block-device FSes		* simple_write_end - .write_end helper for non-block-device FSes
	* @available: See .write_end of address_space_operations		* @file: See .write_end of address_space_operations
	* @file: "
	* @mapping: "		* @mapping: "
	* @pos: "		* @pos: "
	* @len: "		* @len: "

include/linux/bitmap.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -326,10 +326,11 @@ static inline int bitmap_equal(const unsigned long *src1,
	}		}

	/**		/**
	* bitmap_or_equal - Check whether the or of two bitnaps is equal to a third		* bitmap_or_equal - Check whether the or of two bitmaps is equal to a third
	* @src1: Pointer to bitmap 1		* @src1: Pointer to bitmap 1
	* @src2: Pointer to bitmap 2 will be or'ed with bitmap 1		* @src2: Pointer to bitmap 2 will be or'ed with bitmap 1
	* @src3: Pointer to bitmap 3. Compare to the result of @src1 \| @src2		* @src3: Pointer to bitmap 3. Compare to the result of @src1 \| @src2
			* @nbits: number of bits in each of these bitmaps
	*		*
	* Returns: True if (@src1 \| @src2) == *@src3, false otherwise		* Returns: True if (@src1 \| @src2) == *@src3, false otherwise
	*/		*/