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

Commit 522d6d38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (fixes from Andrew Morton) 

Merge misc fixes from Andrew Morton.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (22 commits)
  pidns: fix free_pid() to handle the first fork failure
  ipc,msg: prevent race with rmid in msgsnd,msgrcv
  ipc/sem.c: update sem_otime for all operations
  mm/hwpoison: fix the lack of one reference count against poisoned page
  mm/hwpoison: fix false report on 2nd attempt at page recovery
  mm/hwpoison: fix test for a transparent huge page
  mm/hwpoison: fix traversal of hugetlbfs pages to avoid printk flood
  block: change config option name for cmdline partition parsing
  mm/mlock.c: prevent walking off the end of a pagetable in no-pmd configuration
  mm: avoid reinserting isolated balloon pages into LRU lists
  arch/parisc/mm/fault.c: fix uninitialized variable usage
  include/asm-generic/vtime.h: avoid zero-length file
  nilfs2: fix issue with race condition of competition between segments for dirty blocks
  Documentation/kernel-parameters.txt: replace kernelcore with Movable
  mm/bounce.c: fix a regression where MS_SNAP_STABLE (stable pages snapshotting) was ignored
  kernel/kmod.c: check for NULL in call_usermodehelper_exec()
  ipc/sem.c: synchronize the proc interface
  ipc/sem.c: optimize sem_lock()
  ipc/sem.c: fix race in sem_lock()
  mm/compaction.c: periodically schedule when freeing pages
  ...
parents df532d54 314a8ad0

Documentation/block/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ capability.txt 
	- Generic Block Device Capability (/sys/block/<device>/capability)

cfq-iosched.txt

	- CFQ IO scheduler tunables

cmdline-partition.txt

	- how to specify block device partitions on kernel command line

data-integrity.txt

	- Block data integrity

deadline-iosched.txt

Documentation/block/cmdline-partition.txt

+4 −4
Original line number Diff line number Diff line 
Embedded device command line partition

Embedded device command line partition parsing

=====================================================================



Read block device partition table from command line.

The partition used for fixed block device (eMMC) embedded device.

It is no MBR, save storage space. Bootloader can be easily accessed

Support for reading the block device partition table from the command line.

It is typically used for fixed block (eMMC) embedded devices.

It has no MBR, so saves storage space. Bootloader can be easily accessed

by absolute address of data on the block device.

Users can easily change the partition.

Documentation/kernel-parameters.txt

+5 −1
Original line number Diff line number Diff line
@@ -480,6 +480,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			Format: <io>,<irq>,<mode>

			See header of drivers/net/hamradio/baycom_ser_hdx.c.



	blkdevparts=	Manual partition parsing of block device(s) for

			embedded devices based on command line input.

			See Documentation/block/cmdline-partition.txt



	boot_delay=	Milliseconds to delay each printk during boot.

			Values larger than 10 seconds (10000) are changed to

			no delay (0).
@@ -1357,7 +1361,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			pages. In the event, a node is too small to have both

			kernelcore and Movable pages, kernelcore pages will

			take priority and other nodes will have a larger number

			of kernelcore pages.  The Movable zone is used for the

			of Movable pages.  The Movable zone is used for the

			allocation of pages that may be reclaimed or moved

			by the page migration subsystem.  This means that

			HugeTLB pages may not be allocated from this zone.

arch/parisc/mm/fault.c

+3 −2
Original line number Diff line number Diff line
@@ -182,6 +182,9 @@ void do_page_fault(struct pt_regs *regs, unsigned long code, 


	if (user_mode(regs))

		flags |= FAULT_FLAG_USER;



	acc_type = parisc_acctyp(code, regs->iir);



	if (acc_type & VM_WRITE)

		flags |= FAULT_FLAG_WRITE;

retry:
@@ -196,8 +199,6 @@ retry: 


good_area:



	acc_type = parisc_acctyp(code,regs->iir);



	if ((vma->vm_flags & acc_type) != acc_type)

		goto bad_area;

block/Kconfig

+7 −2
Original line number Diff line number Diff line
@@ -99,11 +99,16 @@ config BLK_DEV_THROTTLING 


	See Documentation/cgroups/blkio-controller.txt for more information.



config CMDLINE_PARSER

config BLK_CMDLINE_PARSER

	bool "Block device command line partition parser"

	default n

	---help---

	Parsing command line, get the partitions information.

	Enabling this option allows you to specify the partition layout from

	the kernel boot args.  This is typically of use for embedded devices

	which don't otherwise have any standardized method for listing the

	partitions on a block device.



	See Documentation/block/cmdline-partition.txt for more information.



menu "Partition Types"