Merge branch 'akpm' (patches from Andrew)

a379f71a · Linus Torvalds <[email protected]> · 2016-10-11 17:34:10 -07:00

Merge more updates from Andrew Morton:

 - a few block updates that fell in my lap

 - lib/ updates

 - checkpatch

 - autofs

 - ipc

 - a ton of misc other things

* emailed patches from Andrew Morton <[email protected]>: (100 commits)
  mm: split gfp_mask and mapping flags into separate fields
  fs: use mapping_set_error instead of opencoded set_bit
  treewide: remove redundant #include <linux/kconfig.h>
  hung_task: allow hung_task_panic when hung_task_warnings is 0
  kthread: add kerneldoc for kthread_create()
  kthread: better support freezable kthread workers
  kthread: allow to modify delayed kthread work
  kthread: allow to cancel kthread work
  kthread: initial support for delayed kthread work
  kthread: detect when a kthread work is used by more workers
  kthread: add kthread_destroy_worker()
  kthread: add kthread_create_worker*()
  kthread: allow to call __kthread_create_on_node() with va_list args
  kthread/smpboot: do not park in kthread_create_on_cpu()
  kthread: kthread worker API cleanup
  kthread: rename probe_kthread_data() to kthread_probe_data()
  scripts/tags.sh: enable code completion in VIM
  mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping
  kdump, vmcoreinfo: report memory sections virtual addresses
  ipc/sem.c: add cond_resched in exit_sme
  ...

Commit: a379f71a30dddbd2e7393624e455ce53c87965d1
Parents: de34f4da · 9c5d760b

Merge commit. Changes below are compared with the first parent: de34f4da.

Changes

200 files changed · +2300 −1061

File	Status	Add	Del	Content
Documentation/DMA-attributes.txt	modified	+17	−0	View file
Documentation/RCU/lockdep-splat.txt	modified	+1	−1	View file
Documentation/dev-tools/kmemleak.rst	modified	+9	−0	View file
Documentation/filesystems/autofs4-mount-control.txt	modified	+42	−29	View file
Documentation/filesystems/autofs4.txt	modified	+4	−4	View file
Documentation/kernel-parameters.txt	modified	+36	−14	View file
arch/arm/include/asm/trusted_foundations.h	modified	+0	−1	View file
arch/arm/kernel/process.c	modified	+1	−2	View file
arch/arm64/include/asm/alternative.h	modified	+0	−1	View file
arch/arm64/kernel/process.c	modified	+2	−6	View file
arch/mips/cavium-octeon/setup.c	modified	+14	−0	View file
arch/mips/include/asm/kexec.h	modified	+1	−0	View file
arch/mips/include/asm/mach-loongson64/loongson.h	modified	+0	−1	View file
arch/mips/kernel/crash.c	modified	+17	−1	View file
arch/mips/kernel/machine_kexec.c	modified	+1	−0	View file
arch/mips/math-emu/cp1emu.c	modified	+0	−1	View file
arch/mips/net/bpf_jit.c	modified	+0	−1	View file
arch/powerpc/kernel/iommu.c	modified	+4	−2	View file
arch/tile/mm/mmap.c	modified	+1	−2	View file
arch/unicore32/kernel/process.c	modified	+1	−2	View file
arch/x86/include/asm/kexec.h	modified	+1	−0	View file
arch/x86/include/asm/smp.h	modified	+1	−0	View file
arch/x86/kernel/crash.c	modified	+19	−3	View file
arch/x86/kernel/machine_kexec_64.c	modified	+3	−0	View file
arch/x86/kernel/process.c	modified	+1	−2	View file
arch/x86/kernel/smp.c	modified	+5	−0	View file
arch/x86/kernel/sys_x86_64.c	modified	+1	−4	View file
arch/x86/kvm/i8254.c	modified	+7	−7	View file
block/blk-lib.c	modified	+15	−0	View file
block/ioctl.c	modified	+12	−6	View file
crypto/crypto_engine.c	modified	+10	−10	View file
drivers/block/loop.c	modified	+4	−4	View file
drivers/char/random.c	modified	+25	−11	View file
drivers/char/virtio_console.c	modified	+0	−1	View file
drivers/infiniband/sw/rdmavt/cq.c	modified	+5	−5	View file
drivers/input/rmi4/rmi_bus.c	modified	+0	−1	View file
drivers/input/rmi4/rmi_driver.c	modified	+0	−1	View file
drivers/input/rmi4/rmi_f01.c	modified	+0	−1	View file
drivers/input/rmi4/rmi_f11.c	modified	+0	−1	View file
drivers/irqchip/irq-bcm6345-l1.c	modified	+0	−1	View file
drivers/irqchip/irq-bcm7038-l1.c	modified	+0	−1	View file
drivers/irqchip/irq-bcm7120-l2.c	modified	+0	−1	View file
drivers/irqchip/irq-brcmstb-l2.c	modified	+0	−1	View file
drivers/md/dm-rq.c	modified	+3	−3	View file
drivers/md/dm.c	modified	+2	−2	View file
drivers/media/dvb-frontends/af9013.h	modified	+0	−1	View file
drivers/media/dvb-frontends/af9033.h	modified	+0	−2	View file
drivers/media/dvb-frontends/ascot2e.h	modified	+0	−1	View file
drivers/media/dvb-frontends/atbm8830.h	modified	+0	−1	View file
drivers/media/dvb-frontends/au8522.h	modified	+0	−1	View file
drivers/media/dvb-frontends/cx22702.h	modified	+0	−1	View file
drivers/media/dvb-frontends/cx24113.h	modified	+0	−2	View file
drivers/media/dvb-frontends/cx24116.h	modified	+0	−1	View file
drivers/media/dvb-frontends/cx24117.h	modified	+0	−1	View file
drivers/media/dvb-frontends/cx24120.h	modified	+0	−1	View file
drivers/media/dvb-frontends/cx24123.h	modified	+0	−1	View file
drivers/media/dvb-frontends/cxd2820r.h	modified	+0	−1	View file
drivers/media/dvb-frontends/cxd2841er.h	modified	+0	−1	View file
drivers/media/dvb-frontends/dib3000mc.h	modified	+0	−2	View file
drivers/media/dvb-frontends/dib7000m.h	modified	+0	−2	View file
drivers/media/dvb-frontends/dib7000p.h	modified	+0	−2	View file
drivers/media/dvb-frontends/drxd.h	modified	+0	−1	View file
drivers/media/dvb-frontends/drxk.h	modified	+0	−1	View file
drivers/media/dvb-frontends/ds3000.h	modified	+0	−1	View file
drivers/media/dvb-frontends/dvb_dummy_fe.h	modified	+0	−1	View file
drivers/media/dvb-frontends/ec100.h	modified	+0	−1	View file
drivers/media/dvb-frontends/hd29l2.h	modified	+0	−1	View file
drivers/media/dvb-frontends/helene.h	modified	+0	−1	View file
drivers/media/dvb-frontends/horus3a.h	modified	+0	−1	View file
drivers/media/dvb-frontends/ix2505v.h	modified	+0	−1	View file
drivers/media/dvb-frontends/lg2160.h	modified	+0	−1	View file
drivers/media/dvb-frontends/lgdt3305.h	modified	+0	−1	View file
drivers/media/dvb-frontends/lgs8gl5.h	modified	+0	−1	View file
drivers/media/dvb-frontends/lgs8gxx.h	modified	+0	−1	View file
drivers/media/dvb-frontends/lnbh24.h	modified	+0	−2	View file
drivers/media/dvb-frontends/lnbh25.h	modified	+0	−1	View file
drivers/media/dvb-frontends/lnbp21.h	modified	+0	−2	View file
drivers/media/dvb-frontends/lnbp22.h	modified	+0	−2	View file
drivers/media/dvb-frontends/m88rs2000.h	modified	+0	−1	View file
drivers/media/dvb-frontends/mb86a20s.h	modified	+0	−1	View file
drivers/media/dvb-frontends/s5h1409.h	modified	+0	−1	View file
drivers/media/dvb-frontends/s5h1411.h	modified	+0	−1	View file
drivers/media/dvb-frontends/s5h1432.h	modified	+0	−1	View file
drivers/media/dvb-frontends/s921.h	modified	+0	−1	View file
drivers/media/dvb-frontends/si21xx.h	modified	+0	−1	View file
drivers/media/dvb-frontends/sp2.h	modified	+0	−1	View file
drivers/media/dvb-frontends/stb6000.h	modified	+0	−1	View file
drivers/media/dvb-frontends/stv0288.h	modified	+0	−1	View file
drivers/media/dvb-frontends/stv0367.h	modified	+0	−1	View file
drivers/media/dvb-frontends/stv0900.h	modified	+0	−1	View file
drivers/media/dvb-frontends/stv6110.h	modified	+0	−1	View file
drivers/media/dvb-frontends/tda10048.h	modified	+0	−1	View file
drivers/media/dvb-frontends/tda18271c2dd.h	modified	+0	−2	View file
drivers/media/dvb-frontends/ts2020.h	modified	+0	−1	View file
drivers/media/dvb-frontends/zl10036.h	modified	+0	−1	View file
drivers/media/dvb-frontends/zl10039.h	modified	+0	−2	View file
drivers/media/pci/cx23885/altera-ci.h	modified	+0	−2	View file
drivers/media/pci/ivtv/ivtv-driver.c	modified	+3	−3	View file
drivers/media/pci/ivtv/ivtv-irq.c	modified	+1	−1	View file
drivers/media/tuners/fc0011.h	modified	+0	−1	View file
drivers/media/tuners/fc0012.h	modified	+0	−1	View file
drivers/media/tuners/fc0013.h	modified	+0	−1	View file
drivers/media/tuners/max2165.h	modified	+0	−2	View file
drivers/media/tuners/mc44s803.h	modified	+0	−2	View file
drivers/media/tuners/mxl5005s.h	modified	+0	−2	View file
drivers/media/tuners/r820t.h	modified	+0	−1	View file
drivers/media/tuners/si2157.h	modified	+0	−1	View file
drivers/media/tuners/tda18212.h	modified	+0	−1	View file
drivers/media/tuners/tda18218.h	modified	+0	−1	View file
drivers/media/tuners/xc5000.h	modified	+0	−1	View file
drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h	modified	+0	−1	View file
drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h	modified	+0	−1	View file
drivers/media/usb/dvb-usb/dibusb-common.c	modified	+0	−1	View file
drivers/media/usb/hdpvr/hdpvr-video.c	modified	+0	−1	View file
drivers/mtd/mtdcore.c	modified	+0	−1	View file
drivers/mtd/mtdpart.c	modified	+0	−1	View file
drivers/net/dsa/b53/b53_mmap.c	modified	+0	−1	View file
drivers/net/ethernet/microchip/encx24j600.c	modified	+5	−5	View file
drivers/net/ethernet/sun/ldmvsw.c	modified	+0	−1	View file
drivers/net/ethernet/wiznet/w5100.c	modified	+0	−1	View file
drivers/net/ethernet/wiznet/w5300.c	modified	+0	−1	View file
drivers/nvme/host/pci.c	modified	+2	−1	View file
drivers/pps/Kconfig	modified	+1	−1	View file
drivers/rapidio/rio_cm.c	modified	+5	−10	View file
drivers/spi/spi.c	modified	+9	−9	View file
drivers/staging/lustre/lustre/llite/vvp_page.c	modified	+1	−4	View file
drivers/tty/serial/sc16is7xx.c	modified	+11	−11	View file
drivers/usb/early/ehci-dbgp.c	modified	+0	−1	View file
drivers/usb/gadget/udc/bcm63xx_udc.c	modified	+0	−1	View file
drivers/usb/host/pci-quirks.c	modified	+0	−1	View file
fs/afs/write.c	modified	+2	−3	View file
fs/autofs4/autofs_i.h	modified	+3	−6	View file
fs/autofs4/dev-ioctl.c	modified	+35	−42	View file
fs/autofs4/inode.c	modified	+23	−22	View file
fs/autofs4/root.c	modified	+1	−3	View file
fs/block_dev.c	modified	+77	−0	View file
fs/buffer.c	modified	+2	−2	View file
fs/exofs/inode.c	modified	+1	−1	View file
fs/ext4/page-io.c	modified	+1	−1	View file
fs/f2fs/data.c	modified	+1	−1	View file
fs/jbd2/commit.c	modified	+1	−2	View file
fs/lockd/procfs.h	modified	+0	−2	View file
fs/ocfs2/dlm/dlmmaster.c	modified	+3	−0	View file
fs/open.c	modified	+2	−1	View file
fs/pipe.c	modified	+96	−70	View file
fs/select.c	modified	+11	−3	View file
include/linux/auto_dev-ioctl.h	modified	+1	−210	View file
include/linux/auto_fs.h	modified	+0	−1	View file
include/linux/ctype.h	modified	+4	−1	View file
include/linux/dma-mapping.h	modified	+5	−0	View file
include/linux/export.h	modified	+0	−1	View file
include/linux/fs.h	modified	+2	−1	View file
include/linux/gpio/driver.h	modified	+0	−1	View file
include/linux/kexec.h	modified	+6	−0	View file
include/linux/kmemleak.h	modified	+18	−0	View file
include/linux/kthread.h	modified	+78	−10	View file
include/linux/pagemap.h	modified	+9	−11	View file
include/linux/radix-tree.h	modified	+8	−0	View file
include/linux/random.h	modified	+1	−1	View file
include/linux/relay.h	modified	+2	−1	View file
include/linux/sem.h	modified	+1	−0	View file
include/uapi/linux/auto_dev-ioctl.h	added	+221	−0	View file
include/uapi/linux/auto_fs.h	modified	+1	−0	View file
init/Kconfig	modified	+1	−0	View file
ipc/msg.c	modified	+97	−107	View file
ipc/sem.c	modified	+85	−55	View file
kernel/configs/android-base.config	modified	+2	−5	View file
kernel/configs/android-recommended.config	modified	+4	−0	View file
kernel/hung_task.c	modified	+14	−14	View file
kernel/kprobes.c	modified	+1	−1	View file
kernel/kthread.c	modified	+507	−70	View file
kernel/panic.c	modified	+40	−7	View file
kernel/ptrace.c	modified	+2	−1	View file
kernel/relay.c	modified	+14	−10	View file
kernel/smpboot.c	modified	+5	−0	View file
kernel/workqueue.c	modified	+1	−1	View file
lib/Makefile	modified	+1	−0	View file
lib/bitmap.c	modified	+46	−4	View file
lib/kstrtox.c	modified	+1	−5	View file
lib/strncpy_from_user.c	modified	+2	−0	View file
mm/bootmem.c	modified	+3	−3	View file
mm/cma.c	modified	+1	−1	View file
mm/kmemleak.c	modified	+47	−0	View file
mm/memblock.c	modified	+4	−4	View file
mm/nobootmem.c	modified	+1	−1	View file
net/batman-adv/debugfs.h	modified	+0	−2	View file
scripts/checkpatch.pl	modified	+245	−93	View file
scripts/const_structs.checkpatch	added	+64	−0	View file
scripts/tags.sh	modified	+2	−1	View file
sound/soc/intel/baytrail/sst-baytrail-ipc.c	modified	+1	−1	View file
sound/soc/intel/common/sst-acpi.h	modified	+0	−1	View file
sound/soc/intel/common/sst-ipc.c	modified	+3	−3	View file
sound/soc/intel/haswell/sst-haswell-ipc.c	modified	+1	−1	View file
sound/soc/intel/skylake/skl-sst-ipc.c	modified	+1	−1	View file
tools/testing/nvdimm/config_check.c	modified	+0	−1	View file
tools/testing/radix-tree/Makefile	modified	+2	−1	View file
tools/testing/radix-tree/iteration_check.c	added	+180	−0	View file
tools/testing/radix-tree/main.c	modified	+1	−0	View file
tools/testing/radix-tree/regression1.c	modified	+1	−1	View file
tools/testing/radix-tree/test.h	modified	+1	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/DMA-attributes.txt

View file

diff --git a/Documentation/DMA-attributes.txt b/Documentation/DMA-attributes.txt
index 2d455a5..98bf7ac 100644
--- a/Documentation/DMA-attributes.txt
+++ b/Documentation/DMA-attributes.txt
@@ -126,3 +126,20 @@ means that we won't try quite as hard to get them.
 
 NOTE: At the moment DMA_ATTR_ALLOC_SINGLE_PAGES is only implemented on ARM,
 though ARM64 patches will likely be posted soon.
+
+DMA_ATTR_NO_WARN
+----------------
+
+This tells the DMA-mapping subsystem to suppress allocation failure reports
+(similarly to __GFP_NOWARN).
+
+On some architectures allocation failures are reported with error messages
+to the system logs.  Although this can help to identify and debug problems,
+drivers which handle failures (eg, retry later) have no problems with them,
+and can actually flood the system logs with error messages that aren't any
+problem at all, depending on the implementation of the retry mechanism.
+
+So, this provides a way for drivers to avoid those error messages on calls
+where allocation failures are not a problem, and shouldn't bother the logs.
+
+NOTE: At the moment DMA_ATTR_NO_WARN is only implemented on PowerPC.

Documentation/RCU/lockdep-splat.txt

View file

diff --git a/Documentation/RCU/lockdep-splat.txt b/Documentation/RCU/lockdep-splat.txt
index bf90611..238e9f6 100644
--- a/Documentation/RCU/lockdep-splat.txt
+++ b/Documentation/RCU/lockdep-splat.txt
@@ -57,7 +57,7 @@ Call Trace:
  [<ffffffff817db154>] kernel_thread_helper+0x4/0x10
  [<ffffffff81066430>] ? finish_task_switch+0x80/0x110
  [<ffffffff817d9c04>] ? retint_restore_args+0xe/0xe
- [<ffffffff81097510>] ? __init_kthread_worker+0x70/0x70
+ [<ffffffff81097510>] ? __kthread_init_worker+0x70/0x70
  [<ffffffff817db150>] ? gs_change+0xb/0xb
 
 Line 2776 of block/cfq-iosched.c in v3.0-rc5 is as follows:

Documentation/dev-tools/kmemleak.rst

View file

diff --git a/Documentation/dev-tools/kmemleak.rst b/Documentation/dev-tools/kmemleak.rst
index 1788722..b2391b8 100644
--- a/Documentation/dev-tools/kmemleak.rst
+++ b/Documentation/dev-tools/kmemleak.rst
@@ -162,6 +162,15 @@ See the include/linux/kmemleak.h header for the functions prototype.
 - ``kmemleak_alloc_recursive`` - as kmemleak_alloc but checks the recursiveness
 - ``kmemleak_free_recursive``	 - as kmemleak_free but checks the recursiveness
 
+The following functions take a physical address as the object pointer
+and only perform the corresponding action if the address has a lowmem
+mapping:
+
+- ``kmemleak_alloc_phys``
+- ``kmemleak_free_part_phys``
+- ``kmemleak_not_leak_phys``
+- ``kmemleak_ignore_phys``
+
 Dealing with false positives/negatives
 --------------------------------------
 

Documentation/filesystems/autofs4-mount-control.txt

View file

diff --git a/Documentation/filesystems/autofs4-mount-control.txt b/Documentation/filesystems/autofs4-mount-control.txt
index aff2211..50a3e01 100644
--- a/Documentation/filesystems/autofs4-mount-control.txt
+++ b/Documentation/filesystems/autofs4-mount-control.txt
@@ -179,8 +179,19 @@ struct autofs_dev_ioctl {
 				 * including this struct */
 	__s32 ioctlfd;          /* automount command fd */
 
-	__u32 arg1;             /* Command parameters */
-	__u32 arg2;
+	union {
+		struct args_protover		protover;
+		struct args_protosubver		protosubver;
+		struct args_openmount		openmount;
+		struct args_ready		ready;
+		struct args_fail		fail;
+		struct args_setpipefd		setpipefd;
+		struct args_timeout		timeout;
+		struct args_requester		requester;
+		struct args_expire		expire;
+		struct args_askumount		askumount;
+		struct args_ismountpoint	ismountpoint;
+	};
 
 	char path[0];
 };
@@ -192,8 +203,8 @@ optionally be used to check a specific mount corresponding to a given
 mount point file descriptor, and when requesting the uid and gid of the
 last successful mount on a directory within the autofs file system.
 
-The fields arg1 and arg2 are used to communicate parameters and results of
-calls made as described below.
+The union is used to communicate parameters and results of calls made
+as described below.
 
 The path field is used to pass a path where it is needed and the size field
 is used account for the increased structure length when translating the
@@ -245,9 +256,9 @@ AUTOFS_DEV_IOCTL_PROTOVER_CMD and AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD
 Get the major and minor version of the autofs4 protocol version understood
 by loaded module. This call requires an initialized struct autofs_dev_ioctl
 with the ioctlfd field set to a valid autofs mount point descriptor
-and sets the requested version number in structure field arg1. These
-commands return 0 on success or one of the negative error codes if
-validation fails.
+and sets the requested version number in version field of struct args_protover
+or sub_version field of struct args_protosubver. These commands return
+0 on success or one of the negative error codes if validation fails.
 
 
 AUTOFS_DEV_IOCTL_OPENMOUNT and AUTOFS_DEV_IOCTL_CLOSEMOUNT
@@ -256,9 +267,9 @@ AUTOFS_DEV_IOCTL_OPENMOUNT and AUTOFS_DEV_IOCTL_CLOSEMOUNT
 Obtain and release a file descriptor for an autofs managed mount point
 path. The open call requires an initialized struct autofs_dev_ioctl with
 the path field set and the size field adjusted appropriately as well
-as the arg1 field set to the device number of the autofs mount. The
-device number can be obtained from the mount options shown in
-/proc/mounts. The close call requires an initialized struct
+as the devid field of struct args_openmount set to the device number of
+the autofs mount. The device number can be obtained from the mount options
+shown in /proc/mounts. The close call requires an initialized struct
 autofs_dev_ioct with the ioctlfd field set to the descriptor obtained
 from the open call. The release of the file descriptor can also be done
 with close(2) so any open descriptors will also be closed at process exit.
@@ -272,10 +283,10 @@ AUTOFS_DEV_IOCTL_READY_CMD and AUTOFS_DEV_IOCTL_FAIL_CMD
 Return mount and expire result status from user space to the kernel.
 Both of these calls require an initialized struct autofs_dev_ioctl
 with the ioctlfd field set to the descriptor obtained from the open
-call and the arg1 field set to the wait queue token number, received
-by user space in the foregoing mount or expire request. The arg2 field
-is set to the status to be returned. For the ready call this is always
-0 and for the fail call it is set to the errno of the operation.
+call and the token field of struct args_ready or struct args_fail set
+to the wait queue token number, received by user space in the foregoing
+mount or expire request. The status field of struct args_fail is set to
+the errno of the operation. It is set to 0 on success.
 
 
 AUTOFS_DEV_IOCTL_SETPIPEFD_CMD
@@ -290,9 +301,10 @@ mount be catatonic (see next call).
 
 The call requires an initialized struct autofs_dev_ioctl with the
 ioctlfd field set to the descriptor obtained from the open call and
-the arg1 field set to descriptor of the pipe. On success the call
-also sets the process group id used to identify the controlling process
-(eg. the owning automount(8) daemon) to the process group of the caller.
+the pipefd field of struct args_setpipefd set to descriptor of the pipe.
+On success the call also sets the process group id used to identify the
+controlling process (eg. the owning automount(8) daemon) to the process
+group of the caller.
 
 
 AUTOFS_DEV_IOCTL_CATATONIC_CMD
@@ -323,9 +335,8 @@ mount on the given path dentry.
 
 The call requires an initialized struct autofs_dev_ioctl with the path
 field set to the mount point in question and the size field adjusted
-appropriately as well as the arg1 field set to the device number of the
-containing autofs mount. Upon return the struct field arg1 contains the
-uid and arg2 the gid.
+appropriately. Upon return the uid field of struct args_requester contains
+the uid and gid field the gid.
 
 When reconstructing an autofs mount tree with active mounts we need to
 re-connect to mounts that may have used the original process uid and
@@ -343,8 +354,9 @@ this ioctl is called until no further expire candidates are found.
 The call requires an initialized struct autofs_dev_ioctl with the
 ioctlfd field set to the descriptor obtained from the open call. In
 addition an immediate expire, independent of the mount timeout, can be
-requested by setting the arg1 field to 1. If no expire candidates can
-be found the ioctl returns -1 with errno set to EAGAIN.
+requested by setting the how field of struct args_expire to 1. If no
+expire candidates can be found the ioctl returns -1 with errno set to
+EAGAIN.
 
 This call causes the kernel module to check the mount corresponding
 to the given ioctlfd for mounts that can be expired, issues an expire
@@ -357,7 +369,8 @@ Checks if an autofs mount point is in use.
 
 The call requires an initialized struct autofs_dev_ioctl with the
 ioctlfd field set to the descriptor obtained from the open call and
-it returns the result in the arg1 field, 1 for busy and 0 otherwise.
+it returns the result in the may_umount field of struct args_askumount,
+1 for busy and 0 otherwise.
 
 
 AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD
@@ -369,12 +382,12 @@ The call requires an initialized struct autofs_dev_ioctl. There are two
 possible variations. Both use the path field set to the path of the mount
 point to check and the size field adjusted appropriately. One uses the
 ioctlfd field to identify a specific mount point to check while the other
-variation uses the path and optionally arg1 set to an autofs mount type.
-The call returns 1 if this is a mount point and sets arg1 to the device
-number of the mount and field arg2 to the relevant super block magic
-number (described below) or 0 if it isn't a mountpoint. In both cases
-the the device number (as returned by new_encode_dev()) is returned
-in field arg1.
+variation uses the path and optionally in.type field of struct args_ismountpoint
+set to an autofs mount type. The call returns 1 if this is a mount point
+and sets out.devid field to the device number of the mount and out.magic
+field to the relevant super block magic number (described below) or 0 if
+it isn't a mountpoint. In both cases the the device number (as returned
+by new_encode_dev()) is returned in out.devid field.
 
 If supplied with a file descriptor we're looking for a specific mount,
 not necessarily at the top of the mounted stack. In this case the path

Documentation/filesystems/autofs4.txt

View file

diff --git a/Documentation/filesystems/autofs4.txt b/Documentation/filesystems/autofs4.txt
index 39d02e1..8fac3fe 100644
--- a/Documentation/filesystems/autofs4.txt
+++ b/Documentation/filesystems/autofs4.txt
@@ -203,9 +203,9 @@ initiated or is being considered, otherwise it returns 0.
 Mountpoint expiry
 -----------------
 
-The VFS has a mechansim for automatically expiring unused mounts,
+The VFS has a mechanism for automatically expiring unused mounts,
 much as it can expire any unused dentry information from the dcache.
-This is guided by the MNT_SHRINKABLE flag.  This  only applies to
+This is guided by the MNT_SHRINKABLE flag.  This only applies to
 mounts that were created by `d_automount()` returning a filesystem to be
 mounted.  As autofs doesn't return such a filesystem but leaves the
 mounting to the automount daemon, it must involve the automount daemon
@@ -298,7 +298,7 @@ remove directories and symlinks using normal filesystem operations.
 autofs knows whether a process requesting some operation is the daemon
 or not based on its process-group id number (see getpgid(1)).
 
-When an autofs filesystem it mounted the pgid of the mounting
+When an autofs filesystem is mounted the pgid of the mounting
 processes is recorded unless the "pgrp=" option is given, in which
 case that number is recorded instead.  Any request arriving from a
 process in that process group is considered to come from the daemon.
@@ -450,7 +450,7 @@ Commands are:
     numbers for existing filesystems can be found in
     `/proc/self/mountinfo`.
 - **AUTOFS_DEV_IOCTL_CLOSEMOUNT_CMD**: same as `close(ioctlfd)`.
-- **AUTOFS_DEV_IOCTL_SETPIPEFD_CMD**: if the  filesystem is in
+- **AUTOFS_DEV_IOCTL_SETPIPEFD_CMD**: if the filesystem is in
     catatonic mode, this can provide the write end of a new pipe
     in `arg1` to re-establish communication with a daemon.  The
     process group of the calling process is used to identify the

Documentation/kernel-parameters.txt

View file

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 705fb91..a1489e1 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -33,6 +33,37 @@ can also be entered as
 Double-quotes can be used to protect spaces in values, e.g.:
 	param="spaces in here"
 
+cpu lists:
+----------
+
+Some kernel parameters take a list of CPUs as a value, e.g.  isolcpus,
+nohz_full, irqaffinity, rcu_nocbs.  The format of this list is:
+
+	<cpu number>,...,<cpu number>
+
+or
+
+	<cpu number>-<cpu number>
+	(must be a positive range in ascending order)
+
+or a mixture
+
+<cpu number>,...,<cpu number>-<cpu number>
+
+Note that for the special case of a range one can split the range into equal
+sized groups and for each group use some amount from the beginning of that
+group:
+
+	<cpu number>-cpu number>:<used size>/<group size>
+
+For example one can add to the command line following parameter:
+
+	isolcpus=1,2,10-20,100-2000:2/25
+
+where the final item represents CPUs 100,101,125,126,150,151,...
+
+
+
 This document may not be entirely up to date and comprehensive. The command
 "modinfo -p ${modulename}" shows a current list of all parameters of a loadable
 module. Loadable modules, after being loaded into the running kernel, also
@@ -1789,13 +1820,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			See Documentation/filesystems/nfs/nfsroot.txt.
 
 	irqaffinity=	[SMP] Set the default irq affinity mask
-			Format:
-			<cpu number>,...,<cpu number>
-			or
-			<cpu number>-<cpu number>
-			(must be a positive range in ascending order)
-			or a mixture
-			<cpu number>,...,<cpu number>-<cpu number>
+			The argument is a cpu list, as described above.
 
 	irqfixup	[HW]
 			When an interrupt is not handled search all handlers
@@ -1812,13 +1837,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			Format: <RDP>,<reset>,<pci_scan>,<verbosity>
 
 	isolcpus=	[KNL,SMP] Isolate CPUs from the general scheduler.
-			Format:
-			<cpu number>,...,<cpu number>
-			or
-			<cpu number>-<cpu number>
-			(must be a positive range in ascending order)
-			or a mixture
-			<cpu number>,...,<cpu number>-<cpu number>
+			The argument is a cpu list, as described above.
 
 			This option can be used to specify one or more CPUs
 			to isolate from the general SMP balancing and scheduling
@@ -2680,6 +2699,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			Default: on
 
 	nohz_full=	[KNL,BOOT]
+			The argument is a cpu list, as described above.
 			In kernels built with CONFIG_NO_HZ_FULL=y, set
 			the specified list of CPUs whose tick will be stopped
 			whenever possible. The boot CPU will be forced outside
@@ -3285,6 +3305,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			See Documentation/blockdev/ramdisk.txt.
 
 	rcu_nocbs=	[KNL]
+			The argument is a cpu list, as described above.
+
 			In kernels built with CONFIG_RCU_NOCB_CPU=y, set
 			the specified list of CPUs to be no-callback CPUs.
 			Invocation of these CPUs' RCU callbacks will

arch/arm/include/asm/trusted_foundations.h

View file

diff --git a/arch/arm/include/asm/trusted_foundations.h b/arch/arm/include/asm/trusted_foundations.h
index 624e1d4..0074835 100644
--- a/arch/arm/include/asm/trusted_foundations.h
+++ b/arch/arm/include/asm/trusted_foundations.h
@@ -26,7 +26,6 @@
 #ifndef __ASM_ARM_TRUSTED_FOUNDATIONS_H
 #define __ASM_ARM_TRUSTED_FOUNDATIONS_H
 
-#include <linux/kconfig.h>
 #include <linux/printk.h>
 #include <linux/bug.h>
 #include <linux/of.h>

arch/arm/kernel/process.c

View file

diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 612eb53..91d2d5b 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -318,8 +318,7 @@ unsigned long get_wchan(struct task_struct *p)
 
 unsigned long arch_randomize_brk(struct mm_struct *mm)
 {
-	unsigned long range_end = mm->brk + 0x02000000;
-	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+	return randomize_page(mm->brk, 0x02000000);
 }
 
 #ifdef CONFIG_MMU

arch/arm64/include/asm/alternative.h

View file

diff --git a/arch/arm64/include/asm/alternative.h b/arch/arm64/include/asm/alternative.h
index 55101bd..39feb85 100644
--- a/arch/arm64/include/asm/alternative.h
+++ b/arch/arm64/include/asm/alternative.h
@@ -7,7 +7,6 @@
 #ifndef __ASSEMBLY__
 
 #include <linux/init.h>
-#include <linux/kconfig.h>
 #include <linux/types.h>
 #include <linux/stddef.h>
 #include <linux/stringify.h>

arch/arm64/kernel/process.c

View file

diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index a4f5f76..27b2f13 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -372,12 +372,8 @@ unsigned long arch_align_stack(unsigned long sp)
 
 unsigned long arch_randomize_brk(struct mm_struct *mm)
 {
-	unsigned long range_end = mm->brk;
-
 	if (is_compat_task())
-		range_end += 0x02000000;
+		return randomize_page(mm->brk, 0x02000000);
 	else
-		range_end += 0x40000000;
-
-	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+		return randomize_page(mm->brk, 0x40000000);
 }

arch/mips/cavium-octeon/setup.c

View file

diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index cb16fcc..5537f95 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -267,6 +267,17 @@ static void octeon_crash_shutdown(struct pt_regs *regs)
 	default_machine_crash_shutdown(regs);
 }
 
+#ifdef CONFIG_SMP
+void octeon_crash_smp_send_stop(void)
+{
+	int cpu;
+
+	/* disable watchdogs */
+	for_each_online_cpu(cpu)
+		cvmx_write_csr(CVMX_CIU_WDOGX(cpu_logical_map(cpu)), 0);
+}
+#endif
+
 #endif /* CONFIG_KEXEC */
 
 #ifdef CONFIG_CAVIUM_RESERVE32
@@ -911,6 +922,9 @@ void __init prom_init(void)
 	_machine_kexec_shutdown = octeon_shutdown;
 	_machine_crash_shutdown = octeon_crash_shutdown;
 	_machine_kexec_prepare = octeon_kexec_prepare;
+#ifdef CONFIG_SMP
+	_crash_smp_send_stop = octeon_crash_smp_send_stop;
+#endif
 #endif
 
 	octeon_user_io_init();

arch/mips/include/asm/kexec.h

View file

diff --git a/arch/mips/include/asm/kexec.h b/arch/mips/include/asm/kexec.h
index ee25ebb..493a3cc 100644
--- a/arch/mips/include/asm/kexec.h
+++ b/arch/mips/include/asm/kexec.h
@@ -45,6 +45,7 @@ extern const unsigned char kexec_smp_wait[];
 extern unsigned long secondary_kexec_args[4];
 extern void (*relocated_kexec_smp_wait) (void *);
 extern atomic_t kexec_ready_to_reboot;
+extern void (*_crash_smp_send_stop)(void);
 #endif
 #endif
 

arch/mips/include/asm/mach-loongson64/loongson.h

View file

diff --git a/arch/mips/include/asm/mach-loongson64/loongson.h b/arch/mips/include/asm/mach-loongson64/loongson.h
index d1ff774..c68c0cc 100644
--- a/arch/mips/include/asm/mach-loongson64/loongson.h
+++ b/arch/mips/include/asm/mach-loongson64/loongson.h
@@ -14,7 +14,6 @@
 #include <linux/io.h>
 #include <linux/init.h>
 #include <linux/irq.h>
-#include <linux/kconfig.h>
 #include <boot_param.h>
 
 /* loongson internal northbridge initialization */

arch/mips/kernel/crash.c

View file

diff --git a/arch/mips/kernel/crash.c b/arch/mips/kernel/crash.c
index 610f0f3..1723b17 100644
--- a/arch/mips/kernel/crash.c
+++ b/arch/mips/kernel/crash.c
@@ -47,9 +47,14 @@ static void crash_shutdown_secondary(void *passed_regs)
 
 static void crash_kexec_prepare_cpus(void)
 {
+	static int cpus_stopped;
 	unsigned int msecs;
+	unsigned int ncpus;
 
-	unsigned int ncpus = num_online_cpus() - 1;/* Excluding the panic cpu */
+	if (cpus_stopped)
+		return;
+
+	ncpus = num_online_cpus() - 1;/* Excluding the panic cpu */
 
 	dump_send_ipi(crash_shutdown_secondary);
 	smp_wmb();
@@ -64,6 +69,17 @@ static void crash_kexec_prepare_cpus(void)
 		cpu_relax();
 		mdelay(1);
 	}
+
+	cpus_stopped = 1;
+}
+
+/* Override the weak function in kernel/panic.c */
+void crash_smp_send_stop(void)
+{
+	if (_crash_smp_send_stop)
+		_crash_smp_send_stop();
+
+	crash_kexec_prepare_cpus();
 }
 
 #else /* !defined(CONFIG_SMP)  */

arch/mips/kernel/machine_kexec.c

View file

diff --git a/arch/mips/kernel/machine_kexec.c b/arch/mips/kernel/machine_kexec.c
index 50980bf..5972520 100644
--- a/arch/mips/kernel/machine_kexec.c
+++ b/arch/mips/kernel/machine_kexec.c
@@ -25,6 +25,7 @@ void (*_machine_crash_shutdown)(struct pt_regs *regs) = NULL;
 #ifdef CONFIG_SMP
 void (*relocated_kexec_smp_wait) (void *);
 atomic_t kexec_ready_to_reboot = ATOMIC_INIT(0);
+void (*_crash_smp_send_stop)(void) = NULL;
 #endif
 
 int

arch/mips/math-emu/cp1emu.c

View file

diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
index 36775d2..f8b7bf8 100644
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
@@ -35,7 +35,6 @@
  */
 #include <linux/sched.h>
 #include <linux/debugfs.h>
-#include <linux/kconfig.h>
 #include <linux/percpu-defs.h>
 #include <linux/perf_event.h>
 

arch/mips/net/bpf_jit.c

View file

diff --git a/arch/mips/net/bpf_jit.c b/arch/mips/net/bpf_jit.c
index 39e7b47..49a2e22 100644
--- a/arch/mips/net/bpf_jit.c
+++ b/arch/mips/net/bpf_jit.c
@@ -14,7 +14,6 @@
 #include <linux/errno.h>
 #include <linux/filter.h>
 #include <linux/if_vlan.h>
-#include <linux/kconfig.h>
 #include <linux/moduleloader.h>
 #include <linux/netdevice.h>
 #include <linux/string.h>

arch/powerpc/kernel/iommu.c

View file

diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index 37d6e74..5f202a5 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -479,7 +479,8 @@ int ppc_iommu_map_sg(struct device *dev, struct iommu_table *tbl,
 
 		/* Handle failure */
 		if (unlikely(entry == DMA_ERROR_CODE)) {
-			if (printk_ratelimit())
+			if (!(attrs & DMA_ATTR_NO_WARN) &&
+			    printk_ratelimit())
 				dev_info(dev, "iommu_alloc failed, tbl %p "
 					 "vaddr %lx npages %lu\n", tbl, vaddr,
 					 npages);
@@ -776,7 +777,8 @@ dma_addr_t iommu_map_page(struct device *dev, struct iommu_table *tbl,
 					 mask >> tbl->it_page_shift, align,
 					 attrs);
 		if (dma_handle == DMA_ERROR_CODE) {
-			if (printk_ratelimit())  {
+			if (!(attrs & DMA_ATTR_NO_WARN) &&
+			    printk_ratelimit())  {
 				dev_info(dev, "iommu_alloc failed, tbl %p "
 					 "vaddr %p npages %d\n", tbl, vaddr,
 					 npages);

arch/tile/mm/mmap.c

View file

diff --git a/arch/tile/mm/mmap.c b/arch/tile/mm/mmap.c
index 851a94e..ef61c59 100644
--- a/arch/tile/mm/mmap.c
+++ b/arch/tile/mm/mmap.c
@@ -88,6 +88,5 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
 
 unsigned long arch_randomize_brk(struct mm_struct *mm)
 {
-	unsigned long range_end = mm->brk + 0x02000000;
-	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+	return randomize_page(mm->brk, 0x02000000);
 }

arch/unicore32/kernel/process.c

View file

diff --git a/arch/unicore32/kernel/process.c b/arch/unicore32/kernel/process.c
index 00299c9..d7c6b67 100644
--- a/arch/unicore32/kernel/process.c
+++ b/arch/unicore32/kernel/process.c
@@ -295,8 +295,7 @@ unsigned long get_wchan(struct task_struct *p)
 
 unsigned long arch_randomize_brk(struct mm_struct *mm)
 {
-	unsigned long range_end = mm->brk + 0x02000000;
-	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+	return randomize_page(mm->brk, 0x02000000);
 }
 
 /*

arch/x86/include/asm/kexec.h

View file

diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h
index d2434c1..282630e 100644
--- a/arch/x86/include/asm/kexec.h
+++ b/arch/x86/include/asm/kexec.h
@@ -210,6 +210,7 @@ struct kexec_entry64_regs {
 
 typedef void crash_vmclear_fn(void);
 extern crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss;
+extern void kdump_nmi_shootdown_cpus(void);
 
 #endif /* __ASSEMBLY__ */
 

arch/x86/include/asm/smp.h

View file

diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 19980b3..026ea82 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -47,6 +47,7 @@ struct smp_ops {
 	void (*smp_cpus_done)(unsigned max_cpus);
 
 	void (*stop_other_cpus)(int wait);
+	void (*crash_stop_other_cpus)(void);
 	void (*smp_send_reschedule)(int cpu);
 
 	int (*cpu_up)(unsigned cpu, struct task_struct *tidle);

arch/x86/kernel/crash.c

View file

diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 9616cf7..650830e 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -133,15 +133,31 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
 	disable_local_APIC();
 }
 
-static void kdump_nmi_shootdown_cpus(void)
+void kdump_nmi_shootdown_cpus(void)
 {
 	nmi_shootdown_cpus(kdump_nmi_callback);
 

This diff is incomplete. Download the complete patch.