diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-20 06:27:18 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-20 06:27:18 -0400 |
| commit | 4958134df54c2c84e9c22ea042761d439164d26e (patch) | |
| tree | 503177afab11f7d25b12a84ce25b481d305c51ba /tools/testing/radix-tree/linux/gfp.h | |
| parent | c4f528795d1add8b63652673f7262729f679c6c1 (diff) | |
| parent | c698ca5278934c0ae32297a8725ced2e27585d7f (diff) | |
Merge 4.16-rc6 into tty-next
We want the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing/radix-tree/linux/gfp.h')
| -rw-r--r-- | tools/testing/radix-tree/linux/gfp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/testing/radix-tree/linux/gfp.h b/tools/testing/radix-tree/linux/gfp.h index e9fff59dfd8a..e3201ccf54c3 100644 --- a/tools/testing/radix-tree/linux/gfp.h +++ b/tools/testing/radix-tree/linux/gfp.h | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #define __GFP_IO 0x40u | 11 | #define __GFP_IO 0x40u |
| 12 | #define __GFP_FS 0x80u | 12 | #define __GFP_FS 0x80u |
| 13 | #define __GFP_NOWARN 0x200u | 13 | #define __GFP_NOWARN 0x200u |
| 14 | #define __GFP_ZERO 0x8000u | ||
| 14 | #define __GFP_ATOMIC 0x80000u | 15 | #define __GFP_ATOMIC 0x80000u |
| 15 | #define __GFP_ACCOUNT 0x100000u | 16 | #define __GFP_ACCOUNT 0x100000u |
| 16 | #define __GFP_DIRECT_RECLAIM 0x400000u | 17 | #define __GFP_DIRECT_RECLAIM 0x400000u |