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

Commit 33e17876 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge yet more updates from Andrew Morton:

 - the rest of MM

 - various misc fixes and tweaks

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (22 commits)
  mm: Change return type int to vm_fault_t for fault handlers
  lib/fonts: convert comments to utf-8
  s390: ebcdic: convert comments to UTF-8
  treewide: convert ISO_8859-1 text comments to utf-8
  drivers/gpu/drm/gma500/: change return type to vm_fault_t
  docs/core-api: mm-api: add section about GFP flags
  docs/mm: make GFP flags descriptions usable as kernel-doc
  docs/core-api: split memory management API to a separate file
  docs/core-api: move *{str,mem}dup* to "String Manipulation"
  docs/core-api: kill trailing whitespace in kernel-api.rst
  mm/util: add kernel-doc for kvfree
  mm/util: make strndup_user description a kernel-doc comment
  fs/proc/vmcore.c: hide vmcoredd_mmap_dumps() for nommu builds
  treewide: correct "differenciate" and "instanciate" typos
  fs/afs: use new return type vm_fault_t
  drivers/hwtracing/intel_th/msu.c: change return type to vm_fault_t
  mm: soft-offline: close the race against page allocation
  mm: fix race on soft-offlining free huge pages
  namei: allow restricted O_CREAT of FIFOs and regular files
  hfs: prevent crash on exit from failed search
  ...
parents d475fac9 2b740303

Documentation/core-api/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ Core utilities 
   errseq

   printk-formats

   circular-buffers

   mm-api

   gfp_mask-from-fs-io

   timekeeping

   boot-time-mm

Documentation/core-api/kernel-api.rst

+4 −55
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ String Manipulation 
.. kernel-doc:: lib/string.c

   :export:



.. kernel-doc:: mm/util.c

   :functions: kstrdup kstrdup_const kstrndup kmemdup kmemdup_nul memdup_user

               vmemdup_user strndup_user memdup_user_nul



Basic Kernel Library Functions

==============================
@@ -155,60 +159,6 @@ UUID/GUID 
.. kernel-doc:: lib/uuid.c

   :export:



Memory Management in Linux

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



The Slab Cache

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



.. kernel-doc:: include/linux/slab.h

   :internal:



.. kernel-doc:: mm/slab.c

   :export:



.. kernel-doc:: mm/util.c

   :export:



User Space Memory Access

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



.. kernel-doc:: arch/x86/include/asm/uaccess.h

   :internal:



.. kernel-doc:: arch/x86/lib/usercopy_32.c

   :export:



More Memory Management Functions

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



.. kernel-doc:: mm/readahead.c

   :export:



.. kernel-doc:: mm/filemap.c

   :export:



.. kernel-doc:: mm/memory.c

   :export:



.. kernel-doc:: mm/vmalloc.c

   :export:



.. kernel-doc:: mm/page_alloc.c

   :internal:



.. kernel-doc:: mm/mempool.c

   :export:



.. kernel-doc:: mm/dmapool.c

   :export:



.. kernel-doc:: mm/page-writeback.c

   :export:



.. kernel-doc:: mm/truncate.c

   :export:



Kernel IPC facilities

=====================
@@ -437,4 +387,3 @@ Read-Copy Update (RCU) 
.. kernel-doc:: include/linux/rcu_sync.h



.. kernel-doc:: kernel/rcu/sync.c

Documentation/core-api/mm-api.rst

0 → 100644
+78 −0
Original line number Diff line number Diff line 
======================

Memory Management APIs

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



User Space Memory Access

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



.. kernel-doc:: arch/x86/include/asm/uaccess.h

   :internal:



.. kernel-doc:: arch/x86/lib/usercopy_32.c

   :export:



.. kernel-doc:: mm/util.c

   :functions: get_user_pages_fast



Memory Allocation Controls

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



Functions which need to allocate memory often use GFP flags to express

how that memory should be allocated. The GFP acronym stands for "get

free pages", the underlying memory allocation function. Not every GFP

flag is allowed to every function which may allocate memory. Most

users will want to use a plain ``GFP_KERNEL``.



.. kernel-doc:: include/linux/gfp.h

   :doc: Page mobility and placement hints



.. kernel-doc:: include/linux/gfp.h

   :doc: Watermark modifiers



.. kernel-doc:: include/linux/gfp.h

   :doc: Reclaim modifiers



.. kernel-doc:: include/linux/gfp.h

   :doc: Common combinations



The Slab Cache

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



.. kernel-doc:: include/linux/slab.h

   :internal:



.. kernel-doc:: mm/slab.c

   :export:



.. kernel-doc:: mm/util.c

   :functions: kfree_const kvmalloc_node kvfree



More Memory Management Functions

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



.. kernel-doc:: mm/readahead.c

   :export:



.. kernel-doc:: mm/filemap.c

   :export:



.. kernel-doc:: mm/memory.c

   :export:



.. kernel-doc:: mm/vmalloc.c

   :export:



.. kernel-doc:: mm/page_alloc.c

   :internal:



.. kernel-doc:: mm/mempool.c

   :export:



.. kernel-doc:: mm/dmapool.c

   :export:



.. kernel-doc:: mm/page-writeback.c

   :export:



.. kernel-doc:: mm/truncate.c

   :export:

Documentation/devicetree/bindings/net/nfc/pn544.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


Required properties:

- compatible: Should be "nxp,pn544-i2c".

- clock-frequency: IC work frequency.

- clock-frequency: I²C work frequency.

- reg: address on the bus

- interrupts: GPIO interrupt to which the chip is connected

- enable-gpios: Output GPIO pin used for enabling/disabling the PN544

Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ compatible (optional) - standard definition 
    - may contain the following strings:

        - shared-dma-pool: This indicates a region of memory meant to be

          used as a shared pool of DMA buffers for a set of devices. It can

          be used by an operating system to instanciate the necessary pool

          be used by an operating system to instantiate the necessary pool

          management subsystem if necessary.

        - vendor specific string in the form <vendor>,[<device>-]<usage>

no-map (optional) - empty property