From: Jonathan Corbet <corbet@lwn.net>
Date: Tue, 20 Nov 2018 16:22:24 +0000 (-0700)
Subject: Merge branch 'kmalloc' into docs-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3870a2371263d4f8e6cec4a8b3860c1f6ee601ad;p=linux.git

Merge branch 'kmalloc' into docs-next

jc: fixed conflict with willy's memory-allocation tag patch.
---

3870a2371263d4f8e6cec4a8b3860c1f6ee601ad
diff --cc include/linux/slab.h
index 918f374e7156f,4a342eb488f67..11bb14a7c069c
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@@ -486,28 -486,26 +486,26 @@@ static __always_inline void *kmalloc_la
   * kmalloc is the normal method of allocating memory
   * for objects smaller than page size in the kernel.
   *
-  * The @flags argument may be one of:
+  * The @flags argument may be one of the GFP flags defined at
+  * include/linux/gfp.h and described at
+  * :ref:`Documentation/core-api/mm-api.rst <mm-api-gfp-flags>`
   *
-  * %GFP_USER - Allocate memory on behalf of user.  May sleep.
+  * The recommended usage of the @flags is described at
 - * :ref:`Documentation/core-api/memory-allocation.rst <memory_allocation>`
++ * :ref:`Documentation/core-api/memory-allocation.rst <memory-allocation>`
   *
-  * %GFP_KERNEL - Allocate normal kernel ram.  May sleep.
+  * Below is a brief outline of the most useful GFP flags
   *
-  * %GFP_ATOMIC - Allocation will not sleep.  May use emergency pools.
-  *   For example, use this inside interrupt handlers.
+  * %GFP_KERNEL
+  *	Allocate normal kernel ram. May sleep.
   *
-  * %GFP_HIGHUSER - Allocate pages from high memory.
+  * %GFP_NOWAIT
+  *	Allocation will not sleep.
   *
-  * %GFP_NOIO - Do not do any I/O at all while trying to get memory.
+  * %GFP_ATOMIC
+  *	Allocation will not sleep.  May use emergency pools.
   *
-  * %GFP_NOFS - Do not make any fs calls while trying to get memory.
-  *
-  * %GFP_NOWAIT - Allocation will not sleep.
-  *
-  * %__GFP_THISNODE - Allocate node-local memory only.
-  *
-  * %GFP_DMA - Allocation suitable for DMA.
-  *   Should only be used for kmalloc() caches. Otherwise, use a
-  *   slab created with SLAB_DMA.
+  * %GFP_HIGHUSER
+  *	Allocate memory from high memory on behalf of user.
   *
   * Also it is possible to set different flags by OR'ing
   * in one or more of the following additional @flags: