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

Commit 271ecc52 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge first patch-bomb from Andrew Morton:

 - some misc things

 - ofs2 updates

 - about half of MM

 - checkpatch updates

 - autofs4 update

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (120 commits)
  autofs4: fix string.h include in auto_dev-ioctl.h
  autofs4: use pr_xxx() macros directly for logging
  autofs4: change log print macros to not insert newline
  autofs4: make autofs log prints consistent
  autofs4: fix some white space errors
  autofs4: fix invalid ioctl return in autofs4_root_ioctl_unlocked()
  autofs4: fix coding style line length in autofs4_wait()
  autofs4: fix coding style problem in autofs4_get_set_timeout()
  autofs4: coding style fixes
  autofs: show pipe inode in mount options
  kallsyms: add support for relative offsets in kallsyms address table
  kallsyms: don't overload absolute symbol type for percpu symbols
  x86: kallsyms: disable absolute percpu symbols on !SMP
  checkpatch: fix another left brace warning
  checkpatch: improve UNSPECIFIED_INT test for bare signed/unsigned uses
  checkpatch: warn on bare unsigned or signed declarations without int
  checkpatch: exclude asm volatile from complex macro check
  mm: memcontrol: drop unnecessary lru locking from mem_cgroup_migrate()
  mm: migrate: consolidate mem_cgroup_migrate() calls
  mm/compaction: speed up pageblock_pfn_to_page() when zone is contiguous
  ...
parents aa6865d8 63c06227

Documentation/kernel-parameters.txt

+16 −1
Original line number Diff line number Diff line
@@ -1759,7 +1759,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	keepinitrd	[HW,ARM]



	kernelcore=nn[KMG]	[KNL,X86,IA-64,PPC] This parameter

	kernelcore=	[KNL,X86,IA-64,PPC]

			Format: nn[KMGTPE] | "mirror"

			This parameter

			specifies the amount of memory usable by the kernel

			for non-movable allocations.  The requested amount is

			spread evenly throughout all nodes in the system. The
@@ -1775,6 +1777,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			use the HighMem zone if it exists, and the Normal

			zone if it does not.



			Instead of specifying the amount of memory (nn[KMGTPE]),

			you can specify "mirror" option. In case "mirror"

			option is specified, mirrored (reliable) memory is used

			for non-movable allocations and remaining memory is used

			for Movable pages. nn[KMGTPE] and "mirror" are exclusive,

			so you can NOT specify nn[KMGTPE] and "mirror" at the same

			time.



	kgdbdbgp=	[KGDB,HW] kgdb over EHCI usb debug port.

			Format: <Controller#>[,poll interval]

			The controller # is the number of the ehci usb debug
@@ -2732,6 +2742,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			we can turn it on.

			on: enable the feature



	page_poison=	[KNL] Boot-time parameter changing the state of

			poisoning on the buddy allocator.

			off: turn off poisoning

			on: turn on poisoning



	panic=		[KNL] Kernel behaviour on panic: delay <timeout>

			timeout > 0: seconds before rebooting

			timeout = 0: wait forever

Documentation/memory-hotplug.txt

+20 −3
Original line number Diff line number Diff line
@@ -256,10 +256,27 @@ If the memory block is offline, you'll read "offline". 


5.2. How to online memory

------------

Even if the memory is hot-added, it is not at ready-to-use state.

For using newly added memory, you have to "online" the memory block.

When the memory is hot-added, the kernel decides whether or not to "online"

it according to the policy which can be read from "auto_online_blocks" file:



For onlining, you have to write "online" to the memory block's state file as:

% cat /sys/devices/system/memory/auto_online_blocks



The default is "offline" which means the newly added memory is not in a

ready-to-use state and you have to "online" the newly added memory blocks

manually. Automatic onlining can be requested by writing "online" to

"auto_online_blocks" file:



% echo online > /sys/devices/system/memory/auto_online_blocks



This sets a global policy and impacts all memory blocks that will subsequently

be hotplugged. Currently offline blocks keep their state. It is possible, under

certain circumstances, that some memory blocks will be added but will fail to

online. User space tools can check their "state" files

(/sys/devices/system/memory/memoryXXX/state) and try to online them manually.



If the automatic onlining wasn't requested, failed, or some memory block was

offlined it is possible to change the individual block's state by writing to the

"state" file:



% echo online > /sys/devices/system/memory/memoryXXX/state

Documentation/printk-formats.txt

+18 −0
Original line number Diff line number Diff line
@@ -298,6 +298,24 @@ bitmap and its derivatives such as cpumask and nodemask: 


	Passed by reference.



Flags bitfields such as page flags, gfp_flags:



	%pGp	referenced|uptodate|lru|active|private

	%pGg	GFP_USER|GFP_DMA32|GFP_NOWARN

	%pGv	read|exec|mayread|maywrite|mayexec|denywrite



	For printing flags bitfields as a collection of symbolic constants that

	would construct the value. The type of flags is given by the third

	character. Currently supported are [p]age flags, [v]ma_flags (both

	expect unsigned long *) and [g]fp_flags (expects gfp_t *). The flag

	names and print order depends on the particular	type.



	Note that this format should not be used directly in TP_printk() part

	of a tracepoint. Instead, use the show_*_flags() functions from

	<trace/events/mmflags.h>.



	Passed by reference.



Network device features:



	%pNF	0x000000000000c000

Documentation/vm/page_owner.txt

+5 −4
Original line number Diff line number Diff line
@@ -28,10 +28,11 @@ with page owner and page owner is disabled in runtime due to no enabling 
boot option, runtime overhead is marginal. If disabled in runtime, it

doesn't require memory to store owner information, so there is no runtime

memory overhead. And, page owner inserts just two unlikely branches into

the page allocator hotpath and if it returns false then allocation is

done like as the kernel without page owner. These two unlikely branches

would not affect to allocation performance. Following is the kernel's

code size change due to this facility.

the page allocator hotpath and if not enabled, then allocation is done

like as the kernel without page owner. These two unlikely branches should

not affect to allocation performance, especially if the static keys jump

label patching functionality is available. Following is the kernel's code

size change due to this facility.



- Without page owner

   text    data     bss     dec     hex filename

Documentation/vm/slub.txt

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ slub_debug=<Debug-Options>,<slab name> 
				Enable options only for select slabs



Possible debug options are

	F		Sanity checks on (enables SLAB_DEBUG_FREE. Sorry

			SLAB legacy issues)

	F		Sanity checks on (enables SLAB_DEBUG_CONSISTENCY_CHECKS

			Sorry SLAB legacy issues)

	Z		Red zoning

	P		Poisoning (object and padding)

	U		User tracking (free and alloc)