Commit 57a8ec38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge more updates from Andrew Morton:
 "VM:
   - z3fold fixes and enhancements by Henry Burns and Vitaly Wool

   - more accurate reclaimed slab caches calculations by Yafang Shao

   - fix MAP_UNINITIALIZED UAPI symbol to not depend on config, by
     Christoph Hellwig

   - !CONFIG_MMU fixes by Christoph Hellwig

   - new novmcoredd parameter to omit device dumps from vmcore, by
     Kairui Song

   - new test_meminit module for testing heap and pagealloc
     initialization, by Alexander Potapenko

   - ioremap improvements for huge mappings, by Anshuman Khandual

   - generalize kprobe page fault handling, by Anshuman Khandual

   - device-dax hotplug fixes and improvements, by Pavel Tatashin

   - enable synchronous DAX fault on powerpc, by Aneesh Kumar K.V

   - add pte_devmap() support for arm64, by Robin Murphy

   - unify locked_vm accounting with a helper, by Daniel Jordan

   - several misc fixes

  core/lib:
   - new typeof_member() macro including some users, by Alexey Dobriyan

   - make BIT() and GENMASK() available in asm, by Masahiro Yamada

   - changed LIST_POISON2 on x86_64 to 0xdead000000000122 for better
     code generation, by Alexey Dobriyan

   - rbtree code size optimizations, by Michel Lespinasse

   - convert struct pid count to refcount_t, by Joel Fernandes

  get_maintainer.pl:
   - add --no-moderated switch to skip moderated ML's, by Joe Perches

  misc:
   - ptrace PTRACE_GET_SYSCALL_INFO interface

   - coda updates

   - gdb scripts, various"

[ Using merge message suggestion from Vlastimil Babka, with some editing - Linus ]

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (100 commits)
  fs/select.c: use struct_size() in kmalloc()
  mm: add account_locked_vm utility function
  arm64: mm: implement pte_devmap support
  mm: introduce ARCH_HAS_PTE_DEVMAP
  mm: clean up is_device_*_page() definitions
  mm/mmap: move common defines to mman-common.h
  mm: move MAP_SYNC to asm-generic/mman-common.h
  device-dax: "Hotremove" persistent memory that is used like normal RAM
  mm/hotplug: make remove_memory() interface usable
  device-dax: fix memory and resource leak if hotplug fails
  include/linux/lz4.h: fix spelling and copy-paste errors in documentation
  ipc/mqueue.c: only perform resource calculation if user valid
  include/asm-generic/bug.h: fix "cut here" for WARN_ON for __WARN_TAINT architectures
  scripts/gdb: add helpers to find and list devices
  scripts/gdb: add lx-genpd-summary command
  drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl
  kernel/pid.c: convert struct pid count to refcount_t
  drivers/rapidio/devices/rio_mport_cdev.c: NUL terminate some strings
  select: shift restore_saved_sigmask_unless() into poll_select_copy_remaining()
  select: change do_poll() to return -ERESTARTNOHAND rather than -EINTR
  ...
parents 0a8ad0ff 43e11fa2

Documentation/admin-guide/kernel-parameters.txt

+11 −0
Original line number Original line Diff line number Diff line
@@ -2877,6 +2877,17 @@ 
			/sys/module/printk/parameters/console_suspend) to

			/sys/module/printk/parameters/console_suspend) to

			turn on/off it dynamically.

			turn on/off it dynamically.





	novmcoredd	[KNL,KDUMP]

			Disable device dump. Device dump allows drivers to

			append dump data to vmcore so you can collect driver

			specified debug info.  Drivers can append the data

			without any limit and this data is stored in memory,

			so this may cause significant memory stress.  Disabling

			device dump can help save memory but the driver debug

			data will be no longer available.  This parameter

			is only available when CONFIG_PROC_VMCORE_DEVICE_DUMP

			is set.



	noaliencache	[MM, NUMA, SLAB] Disables the allocation of alien

	noaliencache	[MM, NUMA, SLAB] Disables the allocation of alien

			caches in the slab allocator.  Saves per-node memory,

			caches in the slab allocator.  Saves per-node memory,

			but will impact performance.

			but will impact performance.

Documentation/devicetree/bindings/usb/s3c2410-usb.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ OHCI 




Required properties:

Required properties:

 - compatible: should be "samsung,s3c2410-ohci" for USB host controller

 - compatible: should be "samsung,s3c2410-ohci" for USB host controller

 - reg: address and lenght of the controller memory mapped region

 - reg: address and length of the controller memory mapped region

 - interrupts: interrupt number for the USB OHCI controller

 - interrupts: interrupt number for the USB OHCI controller

 - clocks: Should reference the bus and host clocks

 - clocks: Should reference the bus and host clocks

 - clock-names: Should contain two strings

 - clock-names: Should contain two strings

Documentation/filesystems/coda.txt

+7 −4
Original line number Original line Diff line number Diff line
@@ -481,7 +481,10 @@ kernel support. 














  struct coda_timespec {

          int64_t         tv_sec;         /* seconds */

          long            tv_nsec;        /* nanoseconds */

  };





  struct coda_vattr {

  struct coda_vattr {

          enum coda_vtype va_type;        /* vnode type (for create) */

          enum coda_vtype va_type;        /* vnode type (for create) */
@@ -493,9 +496,9 @@ kernel support. 
          long            va_fileid;      /* file id */

          long            va_fileid;      /* file id */

          u_quad_t        va_size;        /* file size in bytes */

          u_quad_t        va_size;        /* file size in bytes */

          long            va_blocksize;   /* blocksize preferred for i/o */

          long            va_blocksize;   /* blocksize preferred for i/o */

          struct timespec va_atime;       /* time of last access */

          struct coda_timespec va_atime;  /* time of last access */

          struct timespec va_mtime;       /* time of last modification */

          struct coda_timespec va_mtime;  /* time of last modification */

          struct timespec va_ctime;       /* time file changed */

          struct coda_timespec va_ctime;  /* time file changed */

          u_long          va_gen;         /* generation number of file */

          u_long          va_gen;         /* generation number of file */

          u_long          va_flags;       /* flags defined for file */

          u_long          va_flags;       /* flags defined for file */

          dev_t           va_rdev;        /* device special file represents */

          dev_t           va_rdev;        /* device special file represents */

arch/alpha/include/asm/io.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -93,11 +93,6 @@ static inline void * phys_to_virt(unsigned long address) 




#define page_to_phys(page)	page_to_pa(page)

#define page_to_phys(page)	page_to_pa(page)





static inline dma_addr_t __deprecated isa_page_to_bus(struct page *page)

{

	return page_to_phys(page);

}



/* Maximum PIO space address supported?  */

/* Maximum PIO space address supported?  */

#define IO_SPACE_LIMIT 0xffff

#define IO_SPACE_LIMIT 0xffff

arch/arc/include/asm/pgtable.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ 
#ifndef _ASM_ARC_PGTABLE_H

#ifndef _ASM_ARC_PGTABLE_H

#define _ASM_ARC_PGTABLE_H

#define _ASM_ARC_PGTABLE_H





#include <linux/const.h>

#include <linux/bits.h>

#define __ARCH_USE_5LEVEL_HACK

#define __ARCH_USE_5LEVEL_HACK

#include <asm-generic/pgtable-nopmd.h>

#include <asm-generic/pgtable-nopmd.h>

#include <asm/page.h>

#include <asm/page.h>
@@ -215,11 +215,11 @@ 
#define BITS_FOR_PTE	(PGDIR_SHIFT - PAGE_SHIFT)

#define BITS_FOR_PTE	(PGDIR_SHIFT - PAGE_SHIFT)

#define BITS_FOR_PGD	(32 - PGDIR_SHIFT)

#define BITS_FOR_PGD	(32 - PGDIR_SHIFT)





#define PGDIR_SIZE	_BITUL(PGDIR_SHIFT)	/* vaddr span, not PDG sz */

#define PGDIR_SIZE	BIT(PGDIR_SHIFT)	/* vaddr span, not PDG sz */

#define PGDIR_MASK	(~(PGDIR_SIZE-1))

#define PGDIR_MASK	(~(PGDIR_SIZE-1))





#define	PTRS_PER_PTE	_BITUL(BITS_FOR_PTE)

#define	PTRS_PER_PTE	BIT(BITS_FOR_PTE)

#define	PTRS_PER_PGD	_BITUL(BITS_FOR_PGD)

#define	PTRS_PER_PGD	BIT(BITS_FOR_PGD)





/*

/*

 * Number of entries a user land program use.

 * Number of entries a user land program use.

CRA Git | Maintained and supported by SUSTech CRA and CCSE