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

Commit bf5f8946 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge more updates from Andrew Morton:

 - the rest of MM

 - various misc things

 - procfs updates

 - lib/ updates

 - checkpatch updates

 - kdump/kexec updates

 - add kvmalloc helpers, use them

 - time helper updates for Y2038 issues. We're almost ready to remove
   current_fs_time() but that awaits a btrfs merge.

 - add tracepoints to DAX

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (114 commits)
  drivers/staging/ccree/ssi_hash.c: fix build with gcc-4.4.4
  selftests/vm: add a test for virtual address range mapping
  dax: add tracepoint to dax_insert_mapping()
  dax: add tracepoint to dax_writeback_one()
  dax: add tracepoints to dax_writeback_mapping_range()
  dax: add tracepoints to dax_load_hole()
  dax: add tracepoints to dax_pfn_mkwrite()
  dax: add tracepoints to dax_iomap_pte_fault()
  mtd: nand: nandsim: convert to memalloc_noreclaim_*()
  treewide: convert PF_MEMALLOC manipulations to new helpers
  mm: introduce memalloc_noreclaim_{save,restore}
  mm: prevent potential recursive reclaim due to clearing PF_MEMALLOC
  mm/huge_memory.c: deposit a pgtable for DAX PMD faults when required
  mm/huge_memory.c: use zap_deposited_table() more
  time: delete CURRENT_TIME_SEC and CURRENT_TIME
  gfs2: replace CURRENT_TIME with current_time
  apparmorfs: replace CURRENT_TIME with current_time()
  lustre: replace CURRENT_TIME macro
  fs: ubifs: replace CURRENT_TIME_SEC with current_time
  fs: ufs: use ktime_get_real_ts64() for birthtime
  ...
parents 2d3e4866 4d2b5bca

Documentation/filesystems/vfs.txt

+1 −2
Original line number Diff line number Diff line
@@ -694,8 +694,7 @@ struct address_space_operations { 


  write_end: After a successful write_begin, and data copy, write_end must

        be called. len is the original len passed to write_begin, and copied

        is the amount that was able to be copied (copied == len is always true

	if write_begin was called with the AOP_FLAG_UNINTERRUPTIBLE flag).

        is the amount that was able to be copied.



        The filesystem must take care of unlocking the page and releasing it

        refcount, and updating i_size.

Documentation/powerpc/firmware-assisted-dump.txt

+15 −8
Original line number Diff line number Diff line
@@ -55,10 +55,14 @@ as follows: 
         booted with restricted memory. By default, the boot memory

         size will be the larger of 5% of system RAM or 256MB.

         Alternatively, user can also specify boot memory size

         through boot parameter 'fadump_reserve_mem=' which will

         override the default calculated size. Use this option

         if default boot memory size is not sufficient for second

         kernel to boot successfully.

         through boot parameter 'crashkernel=' which will override

         the default calculated size. Use this option if default

         boot memory size is not sufficient for second kernel to

         boot successfully. For syntax of crashkernel= parameter,

         refer to Documentation/kdump/kdump.txt. If any offset is

         provided in crashkernel= parameter, it will be ignored

         as fadump reserves memory at end of RAM for boot memory

         dump preservation in case of a crash.



-- After the low memory (boot memory) area has been saved, the

   firmware will reset PCI and other hardware state.  It will
@@ -158,13 +162,16 @@ How to enable firmware-assisted dump (fadump): 


1. Set config option CONFIG_FA_DUMP=y and build kernel.

2. Boot into linux kernel with 'fadump=on' kernel cmdline option.

3. Optionally, user can also set 'fadump_reserve_mem=' kernel cmdline

3. Optionally, user can also set 'crashkernel=' kernel cmdline

   to specify size of the memory to reserve for boot memory dump

   preservation.



NOTE: If firmware-assisted dump fails to reserve memory then it will

   fallback to existing kdump mechanism if 'crashkernel=' option

   is set at kernel cmdline.

NOTE: 1. 'fadump_reserve_mem=' parameter has been deprecated. Instead

         use 'crashkernel=' to specify size of the memory to reserve

         for boot memory dump preservation.

      2. If firmware-assisted dump fails to reserve memory then it

         will fallback to existing kdump mechanism if 'crashkernel='

         option is set at kernel cmdline.



Sysfs/debugfs files:

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

Documentation/vm/transhuge.txt

+5 −5
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ thp_collapse_alloc_failed is incremented if khugepaged found a range 
	the allocation.



thp_file_alloc is incremented every time a file huge page is successfully

i	allocated.

	allocated.



thp_file_mapped is incremented every time a file huge page is mapped into

	user address space.
@@ -519,8 +519,8 @@ comes. Splitting will free up unused subpages. 


Splitting the page right away is not an option due to locking context in

the place where we can detect partial unmap. It's also might be

counterproductive since in many cases partial unmap unmap happens during

exit(2) if an THP crosses VMA boundary.

counterproductive since in many cases partial unmap happens during exit(2) if

a THP crosses a VMA boundary.



Function deferred_split_huge_page() is used to queue page for splitting.

The splitting itself will happen when we get memory pressure via shrinker

Makefile

+6 −2
Original line number Diff line number Diff line
@@ -1374,7 +1374,7 @@ help: 
	@echo  '  headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \

	 echo  '                    (default: $(INSTALL_HDR_PATH))'; \

	 echo  ''

	@echo  'Static analysers'

	@echo  'Static analysers:'

	@echo  '  checkstack      - Generate a list of stack hogs'

	@echo  '  namespacecheck  - Name space analysis on compiled kernel'

	@echo  '  versioncheck    - Sanity check on version.h usage'
@@ -1384,7 +1384,7 @@ help: 
	@echo  '  headerdep       - Detect inclusion cycles in headers'

	@$(MAKE) -f $(srctree)/scripts/Makefile.help checker-help

	@echo  ''

	@echo  'Kernel selftest'

	@echo  'Kernel selftest:'

	@echo  '  kselftest       - Build and run kernel selftest (run as root)'

	@echo  '                    Build, install, and boot kernel before'

	@echo  '                    running kselftest on it'
@@ -1392,6 +1392,10 @@ help: 
	@echo  '  kselftest-merge - Merge all the config dependencies of kselftest to existed'

	@echo  '                    .config.'

	@echo  ''

	@echo 'Userspace tools targets:'

	@echo '  use "make tools/help"'

	@echo '  or  "cd tools; make help"'

	@echo  ''

	@echo  'Kernel packaging:'

	@$(MAKE) $(build)=$(package-dir) help

	@echo  ''

arch/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -2,7 +2,11 @@ 
# General architecture dependent options

#



config CRASH_CORE

	bool



config KEXEC_CORE

	select CRASH_CORE

	bool



config HAVE_IMA_KEXEC