Merge branch 'akpm' (patches from Andrew)

814a2bf9 · Linus Torvalds <[email protected]> · 2016-03-18 19:26:54 -07:00

Merge second patch-bomb from Andrew Morton:

 - a couple of hotfixes

 - the rest of MM

 - a new timer slack control in procfs

 - a couple of procfs fixes

 - a few misc things

 - some printk tweaks

 - lib/ updates, notably to radix-tree.

 - add my and Nick Piggin's old userspace radix-tree test harness to
   tools/testing/radix-tree/.  Matthew said it was a godsend during the
   radix-tree work he did.

 - a few code-size improvements, switching to __always_inline where gcc
   screwed up.

 - partially implement character sets in sscanf

* emailed patches from Andrew Morton <[email protected]>: (118 commits)
  sscanf: implement basic character sets
  lib/bug.c: use common WARN helper
  param: convert some "on"/"off" users to strtobool
  lib: add "on"/"off" support to kstrtobool
  lib: update single-char callers of strtobool()
  lib: move strtobool() to kstrtobool()
  include/linux/unaligned: force inlining of byteswap operations
  include/uapi/linux/byteorder, swab: force inlining of some byteswap operations
  include/asm-generic/atomic-long.h: force inlining of some atomic_long operations
  usb: common: convert to use match_string() helper
  ide: hpt366: convert to use match_string() helper
  ata: hpt366: convert to use match_string() helper
  power: ab8500: convert to use match_string() helper
  power: charger_manager: convert to use match_string() helper
  drm/edid: convert to use match_string() helper
  pinctrl: convert to use match_string() helper
  device property: convert to use match_string() helper
  lib/string: introduce match_string() helper
  radix-tree tests: add test for radix_tree_iter_next
  radix-tree tests: add regression3 test
  ...

Commit: 814a2bf957739f367cbebfa1b60237387b72d0ee
Parents: 237045fc · f9310b2f

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

Changes

225 files changed · +5048 −1915

File	Status	Add	Del	Content
Documentation/cgroup-v1/cgroups.txt	modified	+1	−1	View file
Documentation/cgroup-v1/cpusets.txt	modified	+1	−1	View file
Documentation/cgroup-v2.txt	modified	+25	−0	View file
Documentation/filesystems/proc.txt	modified	+18	−0	View file
Documentation/sysctl/vm.txt	modified	+18	−0	View file
Documentation/vm/transhuge.txt	modified	+22	−0	View file
MAINTAINERS	modified	+1	−2	View file
arch/arc/include/asm/hugepage.h	modified	+0	−3	View file
arch/arm/mm/fault.c	modified	+1	−1	View file
arch/arm/mm/mmu.c	modified	+3	−3	View file
arch/arm/mm/pgd.c	modified	+1	−1	View file
arch/arm64/mm/fault.c	modified	+1	−1	View file
arch/arm64/mm/hugetlbpage.c	modified	+1	−1	View file
arch/c6x/Kconfig	modified	+1	−0	View file
arch/ia64/include/asm/io.h	modified	+1	−0	View file
arch/ia64/include/asm/rwsem.h	modified	+1	−1	View file
arch/ia64/mm/hugetlbpage.c	modified	+1	−1	View file
arch/metag/mm/hugetlbpage.c	modified	+1	−1	View file
arch/mips/mm/gup.c	modified	+1	−1	View file
arch/mn10300/Kconfig	modified	+1	−0	View file
arch/mn10300/kernel/fpu-nofpu.c	modified	+1	−0	View file
arch/parisc/mm/hugetlbpage.c	modified	+1	−1	View file
arch/powerpc/Kconfig	modified	+1	−0	View file
arch/powerpc/kernel/rtasd.c	modified	+2	−7	View file
arch/powerpc/kernel/traps.c	modified	+2	−3	View file
arch/powerpc/mm/hash_utils_64.c	modified	+20	−16	View file
arch/powerpc/mm/init_32.c	modified	+4	−4	View file
arch/powerpc/mm/mmu_context_hash64.c	modified	+1	−2	View file
arch/powerpc/mm/pgtable_64.c	modified	+1	−1	View file
arch/powerpc/platforms/512x/mpc512x_shared.c	modified	+1	−1	View file
arch/powerpc/platforms/pseries/hotplug-cpu.c	modified	+2	−8	View file
arch/s390/kernel/time.c	modified	+2	−6	View file
arch/s390/kernel/topology.c	modified	+2	−5	View file
arch/sh/mm/hugetlbpage.c	modified	+1	−1	View file
arch/sparc/mm/hugetlbpage.c	modified	+1	−1	View file
arch/tile/mm/hugetlbpage.c	modified	+1	−1	View file
arch/tile/mm/init.c	modified	+7	−4	View file
arch/um/kernel/skas/mmu.c	modified	+1	−1	View file
arch/unicore32/mm/fault.c	modified	+1	−1	View file
arch/unicore32/mm/pgd.c	modified	+1	−1	View file
arch/x86/kernel/aperture_64.c	modified	+2	−10	View file
arch/x86/kernel/tboot.c	modified	+1	−1	View file
arch/x86/mm/gup.c	modified	+1	−1	View file
arch/xtensa/mm/fault.c	modified	+1	−1	View file
crypto/async_tx/async_pq.c	modified	+1	−1	View file
drivers/ata/pata_hpt366.c	modified	+5	−8	View file
drivers/base/property.c	modified	+4	−8	View file
drivers/block/aoe/aoecmd.c	modified	+2	−2	View file
drivers/firmware/broadcom/bcm47xx_nvram.c	modified	+2	−3	View file
drivers/gpu/drm/drm_edid_load.c	modified	+6	−11	View file
drivers/ide/hpt366.c	modified	+2	−7	View file
drivers/net/ethernet/freescale/gianfar.c	modified	+1	−1	View file
drivers/net/ethernet/intel/fm10k/fm10k_main.c	modified	+1	−1	View file
drivers/net/ethernet/intel/igb/igb_main.c	modified	+1	−1	View file
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	modified	+1	−1	View file
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c	modified	+1	−1	View file
drivers/net/ethernet/mellanox/mlx4/en_rx.c	modified	+4	−5	View file
drivers/net/ethernet/sun/niu.c	modified	+1	−1	View file
drivers/net/wireless/marvell/mwifiex/debugfs.c	modified	+4	−6	View file
drivers/pinctrl/pinmux.c	modified	+3	−10	View file
drivers/power/ab8500_btemp.c	modified	+5	−10	View file
drivers/power/ab8500_charger.c	modified	+5	−11	View file
drivers/power/ab8500_fg.c	modified	+5	−10	View file
drivers/power/abx500_chargalg.c	modified	+5	−9	View file
drivers/power/charger-manager.c	modified	+4	−23	View file
drivers/usb/common/common.c	modified	+8	−14	View file
drivers/virtio/virtio_balloon.c	modified	+6	−0	View file
fs/btrfs/tests/btrfs-tests.c	modified	+1	−2	View file
fs/cifs/cifs_debug.c	modified	+14	−42	View file
fs/cifs/cifs_debug.h	modified	+1	−1	View file
fs/cifs/cifsfs.c	modified	+3	−3	View file
fs/cifs/cifsglob.h	modified	+2	−2	View file
fs/eventpoll.c	modified	+1	−1	View file
fs/nilfs2/page.c	modified	+1	−1	View file
fs/proc/base.c	modified	+70	−1	View file
fs/proc/meminfo.c	modified	+1	−30	View file
fs/proc/page.c	modified	+6	−2	View file
fs/proc/vmcore.c	modified	+5	−2	View file
fs/select.c	modified	+4	−4	View file
include/asm-generic/atomic-long.h	modified	+3	−3	View file
include/asm-generic/bug.h	modified	+18	−9	View file
include/asm-generic/pgtable.h	modified	+17	−0	View file
include/linux/buffer_head.h	modified	+5	−5	View file
include/linux/compaction.h	modified	+16	−0	View file
include/linux/freezer.h	modified	+1	−1	View file
include/linux/gfp.h	modified	+21	−16	View file
include/linux/hrtimer.h	modified	+7	−5	View file
include/linux/huge_mm.h	modified	+13	−9	View file
include/linux/kernel.h	modified	+2	−0	View file
include/linux/list_bl.h	modified	+2	−2	View file
include/linux/memcontrol.h	modified	+33	−11	View file
include/linux/mm.h	modified	+38	−30	View file
include/linux/mmzone.h	modified	+8	−0	View file
include/linux/page-flags-layout.h	modified	+2	−0	View file
include/linux/page-flags.h	modified	+17	−15	View file
include/linux/page_ref.h	added	+173	−0	View file
include/linux/pagemap.h	modified	+3	−16	View file
include/linux/poll.h	modified	+1	−1	View file
include/linux/quicklist.h	modified	+1	−1	View file
include/linux/radix-tree.h	modified	+26	−2	View file
include/linux/rmap.h	modified	+6	−0	View file
include/linux/sched.h	modified	+2	−2	View file
include/linux/sched/sysctl.h	modified	+0	−21	View file
include/linux/string.h	modified	+7	−1	View file
include/linux/tick.h	modified	+1	−1	View file
include/linux/unaligned/access_ok.h	modified	+12	−12	View file
include/linux/vm_event_item.h	modified	+2	−0	View file
include/trace/events/compaction.h	modified	+55	−0	View file
include/trace/events/mmflags.h	modified	+16	−7	View file
include/trace/events/page_ref.h	added	+134	−0	View file
include/uapi/linux/byteorder/big_endian.h	modified	+12	−12	View file
include/uapi/linux/byteorder/little_endian.h	modified	+12	−12	View file
include/uapi/linux/elf-em.h	modified	+0	−3	View file
include/uapi/linux/swab.h	modified	+5	−5	View file
include/uapi/linux/virtio_balloon.h	modified	+2	−1	View file
kernel/fork.c	modified	+9	−1	View file
kernel/panic.c	modified	+26	−15	View file
kernel/printk/printk.c	modified	+66	−74	View file
kernel/sys.c	modified	+4	−1	View file
kernel/sysctl.c	modified	+10	−0	View file
kernel/time/hrtimer.c	modified	+6	−12	View file
kernel/time/tick-sched.c	modified	+2	−8	View file
kernel/time/timer.c	modified	+2	−2	View file
kernel/watchdog.c	modified	+8	−1	View file
lib/bug.c	modified	+2	−13	View file
lib/kstrtox.c	modified	+64	−0	View file
lib/radix-tree.c	modified	+148	−34	View file
lib/string.c	modified	+21	−24	View file
lib/vsprintf.c	modified	+58	−1	View file
mm/Kconfig	modified	+1	−3	View file
mm/Kconfig.debug	modified	+13	−0	View file
mm/Makefile	modified	+1	−0	View file
mm/backing-dev.c	modified	+2	−2	View file
mm/bootmem.c	modified	+3	−4	View file
mm/compaction.c	modified	+227	−5	View file
mm/debug.c	modified	+1	−1	View file
mm/debug_page_ref.c	added	+54	−0	View file
mm/dmapool.c	modified	+7	−11	View file
mm/filemap.c	modified	+18	−37	View file
mm/huge_memory.c	modified	+109	−228	View file
mm/hugetlb.c	modified	+2	−3	View file
mm/internal.h	modified	+3	−10	View file
mm/kasan/report.c	modified	+2	−4	View file
mm/kmemcheck.c	modified	+1	−2	View file
mm/kmemleak-test.c	modified	+1	−1	View file
mm/kmemleak.c	modified	+15	−17	View file
mm/memblock.c	modified	+1	−2	View file
mm/memcontrol.c	modified	+108	−83	View file
mm/memory-failure.c	modified	+21	−31	View file
mm/memory.c	modified	+10	−15	View file
mm/memory_hotplug.c	modified	+29	−25	View file
mm/mempolicy.c	modified	+1	−3	View file
mm/mempool.c	modified	+16	−4	View file
mm/migrate.c	modified	+19	−14	View file
mm/mm_init.c	modified	+3	−4	View file
mm/mmap.c	modified	+3	−130	View file
mm/mmu_notifier.c	modified	+1	−1	View file
mm/mremap.c	modified	+1	−3	View file
mm/nobootmem.c	modified	+2	−2	View file
mm/nommu.c	modified	+0	−117	View file
mm/oom_kill.c	modified	+4	−12	View file
mm/page_alloc.c	modified	+124	−68	View file
mm/page_io.c	modified	+11	−11	View file
mm/page_owner.c	modified	+2	−3	View file
mm/percpu-km.c	modified	+3	−3	View file
mm/percpu.c	modified	+22	−21	View file
mm/pgtable-generic.c	modified	+0	−14	View file
mm/quicklist.c	modified	+1	−1	View file
mm/rmap.c	modified	+54	−17	View file
mm/shmem.c	modified	+21	−28	View file
mm/slab.c	modified	+40	−49	View file
mm/slab.h	modified	+28	−2	View file
mm/slab_common.c	modified	+6	−8	View file
mm/slub.c	modified	+15	−16	View file
mm/sparse-vmemmap.c	modified	+4	−4	View file
mm/sparse.c	modified	+9	−12	View file
mm/swap_cgroup.c	modified	+2	−3	View file
mm/swapfile.c	modified	+1	−2	View file
mm/userfaultfd.c	modified	+1	−2	View file
mm/util.c	modified	+124	−0	View file
mm/vmalloc.c	modified	+15	−16	View file
mm/vmscan.c	modified	+61	−108	View file
mm/vmstat.c	modified	+2	−0	View file
mm/workingset.c	modified	+8	−2	View file
mm/zsmalloc.c	modified	+16	−13	View file
net/core/sock.c	modified	+1	−1	View file
sound/drivers/pcsp/pcsp.c	modified	+5	−4	View file
tools/testing/radix-tree/.gitignore	added	+2	−0	View file
tools/testing/radix-tree/Makefile	added	+19	−0	View file
tools/testing/radix-tree/find_next_bit.c	added	+57	−0	View file
tools/testing/radix-tree/linux.c	added	+60	−0	View file
tools/testing/radix-tree/linux/bitops.h	added	+150	−0	View file
tools/testing/radix-tree/linux/bitops/__ffs.h	added	+43	−0	View file
tools/testing/radix-tree/linux/bitops/ffs.h	added	+41	−0	View file
tools/testing/radix-tree/linux/bitops/ffz.h	added	+12	−0	View file
tools/testing/radix-tree/linux/bitops/find.h	added	+13	−0	View file
tools/testing/radix-tree/linux/bitops/fls.h	added	+41	−0	View file
tools/testing/radix-tree/linux/bitops/fls64.h	added	+14	−0	View file
tools/testing/radix-tree/linux/bitops/hweight.h	added	+11	−0	View file
tools/testing/radix-tree/linux/bitops/le.h	added	+53	−0	View file
tools/testing/radix-tree/linux/bitops/non-atomic.h	added	+111	−0	View file
tools/testing/radix-tree/linux/bug.h	added	+1	−0	View file
tools/testing/radix-tree/linux/cpu.h	added	+34	−0	View file
tools/testing/radix-tree/linux/export.h	added	+2	−0	View file
tools/testing/radix-tree/linux/gfp.h	added	+10	−0	View file
tools/testing/radix-tree/linux/kernel.h	added	+35	−0	View file
tools/testing/radix-tree/linux/kmemleak.h	added	+1	−0	View file
tools/testing/radix-tree/linux/mempool.h	added	+16	−0	View file
tools/testing/radix-tree/linux/notifier.h	added	+8	−0	View file
tools/testing/radix-tree/linux/percpu.h	added	+7	−0	View file
tools/testing/radix-tree/linux/preempt.h	added	+4	−0	View file
tools/testing/radix-tree/linux/radix-tree.h	added	+1	−0	View file
tools/testing/radix-tree/linux/rcupdate.h	added	+9	−0	View file
tools/testing/radix-tree/linux/slab.h	added	+28	−0	View file
tools/testing/radix-tree/linux/types.h	added	+28	−0	View file
tools/testing/radix-tree/main.c	added	+272	−0	View file
tools/testing/radix-tree/rcupdate.c	added	+86	−0	View file
tools/testing/radix-tree/regression.h	added	+8	−0	View file
tools/testing/radix-tree/regression1.c	added	+220	−0	View file
tools/testing/radix-tree/regression2.c	added	+126	−0	View file
tools/testing/radix-tree/regression3.c	added	+117	−0	View file
tools/testing/radix-tree/tag_check.c	added	+332	−0	View file
tools/testing/radix-tree/test.c	added	+219	−0	View file
tools/testing/radix-tree/test.h	added	+40	−0	View file
tools/vm/page-types.c	modified	+119	−14	View file

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

Documentation/cgroup-v1/cgroups.txt

View file

diff --git a/Documentation/cgroup-v1/cgroups.txt b/Documentation/cgroup-v1/cgroups.txt
index c6256ae..947e6fe 100644
--- a/Documentation/cgroup-v1/cgroups.txt
+++ b/Documentation/cgroup-v1/cgroups.txt
@@ -8,7 +8,7 @@ Original copyright statements from cpusets.txt:
 Portions Copyright (C) 2004 BULL SA.
 Portions Copyright (c) 2004-2006 Silicon Graphics, Inc.
 Modified by Paul Jackson <[email protected]>
-Modified by Christoph Lameter <[email protected]>
+Modified by Christoph Lameter <[email protected]>
 
 CONTENTS:
 =========

Documentation/cgroup-v1/cpusets.txt

View file

diff --git a/Documentation/cgroup-v1/cpusets.txt b/Documentation/cgroup-v1/cpusets.txt
index fdf7dff..e5cdcd4 100644
--- a/Documentation/cgroup-v1/cpusets.txt
+++ b/Documentation/cgroup-v1/cpusets.txt
@@ -6,7 +6,7 @@ Written by [email protected]
 
 Portions Copyright (c) 2004-2006 Silicon Graphics, Inc.
 Modified by Paul Jackson <[email protected]>
-Modified by Christoph Lameter <[email protected]>
+Modified by Christoph Lameter <[email protected]>
 Modified by Paul Menage <[email protected]>
 Modified by Hidetoshi Seto <[email protected]>
 

Documentation/cgroup-v2.txt

View file

diff --git a/Documentation/cgroup-v2.txt b/Documentation/cgroup-v2.txt
index ff49cf9..8f1329a 100644
--- a/Documentation/cgroup-v2.txt
+++ b/Documentation/cgroup-v2.txt
@@ -843,6 +843,15 @@ PAGE_SIZE multiple when read back.
 		Amount of memory used to cache filesystem data,
 		including tmpfs and shared memory.
 
+	  kernel_stack
+
+		Amount of memory allocated to kernel stacks.
+
+	  slab
+
+		Amount of memory used for storing in-kernel data
+		structures.
+
 	  sock
 
 		Amount of memory used in network transmission buffers
@@ -871,6 +880,16 @@ PAGE_SIZE multiple when read back.
 		on the internal memory management lists used by the
 		page reclaim algorithm
 
+	  slab_reclaimable
+
+		Part of "slab" that might be reclaimed, such as
+		dentries and inodes.
+
+	  slab_unreclaimable
+
+		Part of "slab" that cannot be reclaimed on memory
+		pressure.
+
 	  pgfault
 
 		Total number of page faults incurred
@@ -1368,6 +1387,12 @@ system than killing the group.  Otherwise, memory.max is there to
 limit this type of spillover and ultimately contain buggy or even
 malicious applications.
 
+Setting the original memory.limit_in_bytes below the current usage was
+subject to a race condition, where concurrent charges could cause the
+limit setting to fail. memory.max on the other hand will first set the
+limit to prevent new charges, and then reclaim and OOM kill until the
+new limit is met - or the task writing to memory.max is killed.
+
 The combined memory+swap accounting and limiting is replaced by real
 control over swap space.
 

Documentation/filesystems/proc.txt

View file

diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index 843b045..7f5607a 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -43,6 +43,7 @@ Table of Contents
   3.7   /proc/<pid>/task/<tid>/children - Information about task children
   3.8   /proc/<pid>/fdinfo/<fd> - Information about opened file
   3.9   /proc/<pid>/map_files - Information about memory mapped files
+  3.10  /proc/<pid>/timerslack_ns - Task timerslack value
 
   4	Configuring procfs
   4.1	Mount options
@@ -1862,6 +1863,23 @@ time one can open(2) mappings from the listings of two processes and
 comparing their inode numbers to figure out which anonymous memory areas
 are actually shared.
 
+3.10	/proc/<pid>/timerslack_ns - Task timerslack value
+---------------------------------------------------------
+This file provides the value of the task's timerslack value in nanoseconds.
+This value specifies a amount of time that normal timers may be deferred
+in order to coalesce timers and avoid unnecessary wakeups.
+
+This allows a task's interactivity vs power consumption trade off to be
+adjusted.
+
+Writing 0 to the file will set the tasks timerslack to the default value.
+
+Valid values are from 0 - ULLONG_MAX
+
+An application setting the value must have PTRACE_MODE_ATTACH_FSCREDS level
+permissions on the task specified to change its timerslack_ns value.
+
+
 ------------------------------------------------------------------------------
 Configuring procfs
 ------------------------------------------------------------------------------

Documentation/sysctl/vm.txt

View file

diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt
index 89a887c..cb03684 100644
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
@@ -803,6 +803,24 @@ performance impact. Reclaim code needs to take various locks to find freeable
 directory and inode objects. With vfs_cache_pressure=1000, it will look for
 ten times more freeable objects than there are.
 
+=============================================================
+
+watermark_scale_factor:
+
+This factor controls the aggressiveness of kswapd. It defines the
+amount of memory left in a node/system before kswapd is woken up and
+how much memory needs to be free before kswapd goes back to sleep.
+
+The unit is in fractions of 10,000. The default value of 10 means the
+distances between watermarks are 0.1% of the available memory in the
+node/system. The maximum value is 1000, or 10% of memory.
+
+A high rate of threads entering direct reclaim (allocstall) or kswapd
+going to sleep prematurely (kswapd_low_wmark_hit_quickly) can indicate
+that the number of free pages kswapd maintains for latency reasons is
+too small for the allocation bursts occurring in the system. This knob
+can then be used to tune kswapd aggressiveness accordingly.
+
 ==============================================================
 
 zone_reclaim_mode:

Documentation/vm/transhuge.txt

View file

diff --git a/Documentation/vm/transhuge.txt b/Documentation/vm/transhuge.txt
index 21cf34f..d9cb65c 100644
--- a/Documentation/vm/transhuge.txt
+++ b/Documentation/vm/transhuge.txt
@@ -113,9 +113,26 @@ guaranteed, but it may be more likely in case the allocation is for a
 MADV_HUGEPAGE region.
 
 echo always >/sys/kernel/mm/transparent_hugepage/defrag
+echo defer >/sys/kernel/mm/transparent_hugepage/defrag
 echo madvise >/sys/kernel/mm/transparent_hugepage/defrag
 echo never >/sys/kernel/mm/transparent_hugepage/defrag
 
+"always" means that an application requesting THP will stall on allocation
+failure and directly reclaim pages and compact memory in an effort to
+allocate a THP immediately. This may be desirable for virtual machines
+that benefit heavily from THP use and are willing to delay the VM start
+to utilise them.
+
+"defer" means that an application will wake kswapd in the background
+to reclaim pages and wake kcompact to compact memory so that THP is
+available in the near future. It's the responsibility of khugepaged
+to then install the THP pages later.
+
+"madvise" will enter direct reclaim like "always" but only for regions
+that are have used madvise(MADV_HUGEPAGE). This is the default behaviour.
+
+"never" should be self-explanatory.
+
 By default kernel tries to use huge zero page on read page fault.
 It's possible to disable huge zero page by writing 0 or enable it
 back by writing 1:
@@ -229,6 +246,11 @@ thp_split_page is incremented every time a huge page is split into base
 thp_split_page_failed is is incremented if kernel fails to split huge
 	page. This can happen if the page was pinned by somebody.
 
+thp_deferred_split_page is incremented when a huge page is put onto split
+	queue. This happens when a huge page is partially unmapped and
+	splitting it would free up some memory. Pages on split queue are
+	going to be split under memory pressure.
+
 thp_split_pmd is incremented every time a PMD split into table of PTEs.
 	This can happen, for instance, when application calls mprotect() or
 	munmap() on part of huge page. It doesn't split huge page, only

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 1c6d778..2933d90 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8498,7 +8498,7 @@ F:	include/crypto/pcrypt.h
 
 PER-CPU MEMORY ALLOCATOR
 M:	Tejun Heo <[email protected]>
-M:	Christoph Lameter <[email protected]>
+M:	Christoph Lameter <[email protected]>
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git
 S:	Maintained
 F:	include/linux/percpu*.h
@@ -11296,7 +11296,6 @@ F:	include/linux/cdrom.h
 F:	include/uapi/linux/cdrom.h
 
 UNISYS S-PAR DRIVERS
-M:	Benjamin Romer <[email protected]>
 M:	David Kershner <[email protected]>
 L:	[email protected] (Unisys internal)
 S:	Supported

arch/arc/include/asm/hugepage.h

View file

diff --git a/arch/arc/include/asm/hugepage.h b/arch/arc/include/asm/hugepage.h
index c5094de..7afe335 100644
--- a/arch/arc/include/asm/hugepage.h
+++ b/arch/arc/include/asm/hugepage.h
@@ -30,19 +30,16 @@ static inline pmd_t pte_pmd(pte_t pte)
 #define pmd_mkyoung(pmd)	pte_pmd(pte_mkyoung(pmd_pte(pmd)))
 #define pmd_mkhuge(pmd)		pte_pmd(pte_mkhuge(pmd_pte(pmd)))
 #define pmd_mknotpresent(pmd)	pte_pmd(pte_mknotpresent(pmd_pte(pmd)))
-#define pmd_mksplitting(pmd)	pte_pmd(pte_mkspecial(pmd_pte(pmd)))
 #define pmd_mkclean(pmd)	pte_pmd(pte_mkclean(pmd_pte(pmd)))
 
 #define pmd_write(pmd)		pte_write(pmd_pte(pmd))
 #define pmd_young(pmd)		pte_young(pmd_pte(pmd))
 #define pmd_pfn(pmd)		pte_pfn(pmd_pte(pmd))
 #define pmd_dirty(pmd)		pte_dirty(pmd_pte(pmd))
-#define pmd_special(pmd)	pte_special(pmd_pte(pmd))
 
 #define mk_pmd(page, prot)	pte_pmd(mk_pte(page, prot))
 
 #define pmd_trans_huge(pmd)	(pmd_val(pmd) & _PAGE_HW_SZ)
-#define pmd_trans_splitting(pmd)	(pmd_trans_huge(pmd) && pmd_special(pmd))
 
 #define pfn_pmd(pfn, prot)	(__pmd(((pfn) << PAGE_SHIFT) | pgprot_val(prot)))
 

arch/arm/mm/fault.c

View file

diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index daafcf1..ad58418 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -346,7 +346,7 @@ retry:
 	up_read(&mm->mmap_sem);
 
 	/*
-	 * Handle the "normal" case first - VM_FAULT_MAJOR / VM_FAULT_MINOR
+	 * Handle the "normal" case first - VM_FAULT_MAJOR
 	 */
 	if (likely(!(fault & (VM_FAULT_ERROR | VM_FAULT_BADMAP | VM_FAULT_BADACCESS))))
 		return 0;

arch/arm/mm/mmu.c

View file

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 434d76f..88fbe0d 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -732,7 +732,7 @@ static void *__init late_alloc(unsigned long sz)
 	return ptr;
 }
 
-static pte_t * __init pte_alloc(pmd_t *pmd, unsigned long addr,
+static pte_t * __init arm_pte_alloc(pmd_t *pmd, unsigned long addr,
 				unsigned long prot,
 				void *(*alloc)(unsigned long sz))
 {
@@ -747,7 +747,7 @@ static pte_t * __init pte_alloc(pmd_t *pmd, unsigned long addr,
 static pte_t * __init early_pte_alloc(pmd_t *pmd, unsigned long addr,
 				      unsigned long prot)
 {
-	return pte_alloc(pmd, addr, prot, early_alloc);
+	return arm_pte_alloc(pmd, addr, prot, early_alloc);
 }
 
 static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,
@@ -756,7 +756,7 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,
 				  void *(*alloc)(unsigned long sz),
 				  bool ng)
 {
-	pte_t *pte = pte_alloc(pmd, addr, type->prot_l1, alloc);
+	pte_t *pte = arm_pte_alloc(pmd, addr, type->prot_l1, alloc);
 	do {
 		set_pte_ext(pte, pfn_pte(pfn, __pgprot(type->prot_pte)),
 			    ng ? PTE_EXT_NG : 0);

arch/arm/mm/pgd.c

View file

diff --git a/arch/arm/mm/pgd.c b/arch/arm/mm/pgd.c
index e683db1..b8d4773 100644
--- a/arch/arm/mm/pgd.c
+++ b/arch/arm/mm/pgd.c
@@ -80,7 +80,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
 		if (!new_pmd)
 			goto no_pmd;
 
-		new_pte = pte_alloc_map(mm, NULL, new_pmd, 0);
+		new_pte = pte_alloc_map(mm, new_pmd, 0);
 		if (!new_pte)
 			goto no_pte;
 

arch/arm64/mm/fault.c

View file

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 0077674..95df28b 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -304,7 +304,7 @@ retry:
 	up_read(&mm->mmap_sem);
 
 	/*
-	 * Handle the "normal" case first - VM_FAULT_MAJOR / VM_FAULT_MINOR
+	 * Handle the "normal" case first - VM_FAULT_MAJOR
 	 */
 	if (likely(!(fault & (VM_FAULT_ERROR | VM_FAULT_BADMAP |
 			      VM_FAULT_BADACCESS))))

arch/arm64/mm/hugetlbpage.c

View file

diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
index da30529..589fd28 100644
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
@@ -124,7 +124,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,
 		 * will be no pte_unmap() to correspond with this
 		 * pte_alloc_map().
 		 */
-		pte = pte_alloc_map(mm, NULL, pmd, addr);
+		pte = pte_alloc_map(mm, pmd, addr);
 	} else if (sz == PMD_SIZE) {
 		if (IS_ENABLED(CONFIG_ARCH_WANT_HUGE_PMD_SHARE) &&
 		    pud_none(*pud))

arch/c6x/Kconfig

View file

diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig
index 79049d4..5aa8ea8 100644
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@ -36,6 +36,7 @@ config GENERIC_HWEIGHT
 
 config GENERIC_BUG
 	def_bool y
+	depends on BUG
 
 config C6X_BIG_KERNEL
 	bool "Build a big kernel"

arch/ia64/include/asm/io.h

View file

diff --git a/arch/ia64/include/asm/io.h b/arch/ia64/include/asm/io.h
index a865d2a..5de673a 100644
--- a/arch/ia64/include/asm/io.h
+++ b/arch/ia64/include/asm/io.h
@@ -433,6 +433,7 @@ static inline void __iomem * ioremap_cache (unsigned long phys_addr, unsigned lo
 	return ioremap(phys_addr, size);
 }
 #define ioremap_cache ioremap_cache
+#define ioremap_uc ioremap_nocache
 
 
 /*

arch/ia64/include/asm/rwsem.h

View file

diff --git a/arch/ia64/include/asm/rwsem.h b/arch/ia64/include/asm/rwsem.h
index 3027e75..ce11247 100644
--- a/arch/ia64/include/asm/rwsem.h
+++ b/arch/ia64/include/asm/rwsem.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003 Ken Chen <[email protected]>
  * Copyright (C) 2003 Asit Mallick <[email protected]>
- * Copyright (C) 2005 Christoph Lameter <[email protected]>
+ * Copyright (C) 2005 Christoph Lameter <[email protected]>
  *
  * Based on asm-i386/rwsem.h and other architecture implementation.
  *

arch/ia64/mm/hugetlbpage.c

View file

diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
index f50d4b3..85de86d 100644
--- a/arch/ia64/mm/hugetlbpage.c
+++ b/arch/ia64/mm/hugetlbpage.c
@@ -38,7 +38,7 @@ huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz)
 	if (pud) {
 		pmd = pmd_alloc(mm, pud, taddr);
 		if (pmd)
-			pte = pte_alloc_map(mm, NULL, pmd, taddr);
+			pte = pte_alloc_map(mm, pmd, taddr);
 	}
 	return pte;
 }

arch/metag/mm/hugetlbpage.c

View file

diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
index 53f0f6c..b38700a 100644
--- a/arch/metag/mm/hugetlbpage.c
+++ b/arch/metag/mm/hugetlbpage.c
@@ -67,7 +67,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,
 	pgd = pgd_offset(mm, addr);
 	pud = pud_offset(pgd, addr);
 	pmd = pmd_offset(pud, addr);
-	pte = pte_alloc_map(mm, NULL, pmd, addr);
+	pte = pte_alloc_map(mm, pmd, addr);
 	pgd->pgd &= ~_PAGE_SZ_MASK;
 	pgd->pgd |= _PAGE_SZHUGE;
 

arch/mips/mm/gup.c

View file

diff --git a/arch/mips/mm/gup.c b/arch/mips/mm/gup.c
index 1afd87c..6cdffc7 100644
--- a/arch/mips/mm/gup.c
+++ b/arch/mips/mm/gup.c
@@ -64,7 +64,7 @@ static inline void get_head_page_multiple(struct page *page, int nr)
 {
 	VM_BUG_ON(page != compound_head(page));
 	VM_BUG_ON(page_count(page) == 0);
-	atomic_add(nr, &page->_count);
+	page_ref_add(page, nr);
 	SetPageReferenced(page);
 }
 

arch/mn10300/Kconfig

View file

diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 10607f0..06ddb55 100644
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -53,6 +53,7 @@ config GENERIC_HWEIGHT
 
 config GENERIC_BUG
 	def_bool y
+	depends on BUG
 
 config QUICKLIST
 	def_bool y

arch/mn10300/kernel/fpu-nofpu.c

View file

diff --git a/arch/mn10300/kernel/fpu-nofpu.c b/arch/mn10300/kernel/fpu-nofpu.c
index 31c765b..8d0e041 100644
--- a/arch/mn10300/kernel/fpu-nofpu.c
+++ b/arch/mn10300/kernel/fpu-nofpu.c
@@ -9,6 +9,7 @@
  * 2 of the Licence, or (at your option) any later version.
  */
 #include <asm/fpu.h>
+#include <asm/elf.h>
 
 /*
  * handle an FPU operational exception

arch/parisc/mm/hugetlbpage.c

View file

diff --git a/arch/parisc/mm/hugetlbpage.c b/arch/parisc/mm/hugetlbpage.c
index 54ba392..5d6eea9 100644
--- a/arch/parisc/mm/hugetlbpage.c
+++ b/arch/parisc/mm/hugetlbpage.c
@@ -63,7 +63,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,
 	if (pud) {
 		pmd = pmd_alloc(mm, pud, addr);
 		if (pmd)
-			pte = pte_alloc_map(mm, NULL, pmd, addr);
+			pte = pte_alloc_map(mm, pmd, addr);
 	}
 	return pte;
 }

arch/powerpc/Kconfig

View file

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 832cc46..a030e5e 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -158,6 +158,7 @@ config PPC
 	select ARCH_HAS_DEVMEM_IS_ALLOWED
 	select HAVE_ARCH_SECCOMP_FILTER
 	select ARCH_HAS_UBSAN_SANITIZE_ALL
+	select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
 
 config GENERIC_CSUM
 	def_bool CPU_LITTLE_ENDIAN

arch/powerpc/kernel/rtasd.c

View file

diff --git a/arch/powerpc/kernel/rtasd.c b/arch/powerpc/kernel/rtasd.c
index 5a2c049..aa610ce 100644
--- a/arch/powerpc/kernel/rtasd.c
+++ b/arch/powerpc/kernel/rtasd.c
@@ -49,7 +49,7 @@ static unsigned int rtas_error_log_buffer_max;
 static unsigned int event_scan;
 static unsigned int rtas_event_scan_rate;
 
-static int full_rtas_msgs = 0;
+static bool full_rtas_msgs;
 
 /* Stop logging to nvram after first fatal error */
 static int logging_enabled; /* Until we initialize everything,
@@ -592,11 +592,6 @@ __setup("surveillance=", surveillance_setup);
 
 static int __init rtasmsgs_setup(char *str)
 {
-	if (strcmp(str, "on") == 0)
-		full_rtas_msgs = 1;
-	else if (strcmp(str, "off") == 0)
-		full_rtas_msgs = 0;
-
-	return 1;
+	return (kstrtobool(str, &full_rtas_msgs) == 0);
 }
 __setup("rtasmsgs=", rtasmsgs_setup);

arch/powerpc/kernel/traps.c

View file

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index b6becc7..33c47fc 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -203,9 +203,8 @@ static int __kprobes __die(const char *str, struct pt_regs *regs, long err)
 #ifdef CONFIG_SMP
 	printk("SMP NR_CPUS=%d ", NR_CPUS);
 #endif
-#ifdef CONFIG_DEBUG_PAGEALLOC
-	printk("DEBUG_PAGEALLOC ");
-#endif
+	if (debug_pagealloc_enabled())
+		printk("DEBUG_PAGEALLOC ");
 #ifdef CONFIG_NUMA
 	printk("NUMA ");
 #endif

arch/powerpc/mm/hash_utils_64.c

View file

diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index ba59d59..1005281 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -255,8 +255,10 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
 
 		if (ret < 0)
 			break;
+
 #ifdef CONFIG_DEBUG_PAGEALLOC
-		if ((paddr >> PAGE_SHIFT) < linear_map_hash_count)
+		if (debug_pagealloc_enabled() &&
+			(paddr >> PAGE_SHIFT) < linear_map_hash_count)
 			linear_map_hash_slots[paddr >> PAGE_SHIFT] = ret | 0x80;
 #endif /* CONFIG_DEBUG_PAGEALLOC */
 	}
@@ -512,17 +514,17 @@ static void __init htab_init_page_sizes(void)
 	if (mmu_has_feature(MMU_FTR_16M_PAGE))
 		memcpy(mmu_psize_defs, mmu_psize_defaults_gp,
 		       sizeof(mmu_psize_defaults_gp));
- found:
-#ifndef CONFIG_DEBUG_PAGEALLOC
-	/*
-	 * Pick a size for the linear mapping. Currently, we only support
-	 * 16M, 1M and 4K which is the default
-	 */
-	if (mmu_psize_defs[MMU_PAGE_16M].shift)
-		mmu_linear_psize = MMU_PAGE_16M;
-	else if (mmu_psize_defs[MMU_PAGE_1M].shift)
-		mmu_linear_psize = MMU_PAGE_1M;
-#endif /* CONFIG_DEBUG_PAGEALLOC */
+found:
+	if (!debug_pagealloc_enabled()) {
+		/*
+		 * Pick a size for the linear mapping. Currently, we only
+		 * support 16M, 1M and 4K which is the default
+		 */
+		if (mmu_psize_defs[MMU_PAGE_16M].shift)
+			mmu_linear_psize = MMU_PAGE_16M;
+		else if (mmu_psize_defs[MMU_PAGE_1M].shift)
+			mmu_linear_psize = MMU_PAGE_1M;
+	}
 
 #ifdef CONFIG_PPC_64K_PAGES
 	/*
@@ -721,10 +723,12 @@ static void __init htab_initialize(void)
 	prot = pgprot_val(PAGE_KERNEL);
 
 #ifdef CONFIG_DEBUG_PAGEALLOC
-	linear_map_hash_count = memblock_end_of_DRAM() >> PAGE_SHIFT;
-	linear_map_hash_slots = __va(memblock_alloc_base(linear_map_hash_count,
-						    1, ppc64_rma_size));
-	memset(linear_map_hash_slots, 0, linear_map_hash_count);
+	if (debug_pagealloc_enabled()) {
+		linear_map_hash_count = memblock_end_of_DRAM() >> PAGE_SHIFT;
+		linear_map_hash_slots = __va(memblock_alloc_base(
+				linear_map_hash_count, 1, ppc64_rma_size));
+		memset(linear_map_hash_slots, 0, linear_map_hash_count);
+	}
 #endif /* CONFIG_DEBUG_PAGEALLOC */
 
 	/* On U3 based machines, we need to reserve the DART area and

arch/powerpc/mm/init_32.c

View file

diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index a10be66..c2b7716 100644
--- a/arch/powerpc/mm/init_32.c
+++ b/arch/powerpc/mm/init_32.c
@@ -112,10 +112,10 @@ void __init MMU_setup(void)
 	if (strstr(boot_command_line, "noltlbs")) {
 		__map_without_ltlbs = 1;
 	}
-#ifdef CONFIG_DEBUG_PAGEALLOC
-	__map_without_bats = 1;
-	__map_without_ltlbs = 1;
-#endif
+	if (debug_pagealloc_enabled()) {
+		__map_without_bats = 1;
+		__map_without_ltlbs = 1;
+	}
 }
 
 /*

arch/powerpc/mm/mmu_context_hash64.c

View file

diff --git a/arch/powerpc/mm/mmu_context_hash64.c b/arch/powerpc/mm/mmu_context_hash64.c
index 4e4efbc..9ca6fe1 100644
--- a/arch/powerpc/mm/mmu_context_hash64.c
+++ b/arch/powerpc/mm/mmu_context_hash64.c
@@ -118,8 +118,7 @@ static void destroy_pagetable_page(struct mm_struct *mm)
 	/* drop all the pending references */
 	count = ((unsigned long)pte_frag & ~PAGE_MASK) >> PTE_FRAG_SIZE_SHIFT;
 	/* We allow PTE_FRAG_NR fragments from a PTE page */
-	count = atomic_sub_return(PTE_FRAG_NR - count, &page->_count);
-	if (!count) {
+	if (page_ref_sub_and_test(page, PTE_FRAG_NR - count)) {
 		pgtable_page_dtor(page);
 		free_hot_cold_page(page, 0);
 	}

arch/powerpc/mm/pgtable_64.c

View file

diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index cdf2123..d9cc66c 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -403,7 +403,7 @@ static pte_t *__alloc_for_cache(struct mm_struct *mm, int kernel)
 	 * count.
 	 */
 	if (likely(!mm->context.pte_frag)) {
-		atomic_set(&page->_count, PTE_FRAG_NR);
+		set_page_count(page, PTE_FRAG_NR);
 		mm->context.pte_frag = ret + PTE_FRAG_SIZE;
 	}
 	spin_unlock(&mm->page_table_lock);

arch/powerpc/platforms/512x/mpc512x_shared.c

View file

diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c
index 711f3d3..452da23 100644
--- a/arch/powerpc/platforms/512x/mpc512x_shared.c
+++ b/arch/powerpc/platforms/512x/mpc512x_shared.c
@@ -188,7 +188,7 @@ static struct fsl_diu_shared_fb __attribute__ ((__aligned__(8))) diu_shared_fb;
 static inline void mpc512x_free_bootmem(struct page *page)
 {
 	BUG_ON(PageTail(page));
-	BUG_ON(atomic_read(&page->_count) > 1);
+	BUG_ON(page_ref_count(page) > 1);
 	free_reserved_page(page);
 }
 