diff options
| author | Stefan Schmidt <[email protected]> | 2019-03-19 16:25:37 +0100 |
|---|---|---|
| committer | Stefan Schmidt <[email protected]> | 2019-03-19 16:25:37 +0100 |
| commit | 86008304dc2ad41a274cdacb585c641ec6bbb558 (patch) | |
| tree | 7d8fdd6d9cbba05cebb7d36c4309ea2bb48e0af0 /include/linux/types.h | |
| parent | 19b39a25388e71390e059906c979f87be4ef0c71 (diff) | |
| parent | ffa91253739ca89fc997195d8bbd1f7ba3e29fbe (diff) | |
Merge remote-tracking branch 'net/master'
Diffstat (limited to 'include/linux/types.h')
| -rw-r--r-- | include/linux/types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/types.h b/include/linux/types.h index c2615d6a019e..cc0dbbe551d5 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -155,9 +155,9 @@ typedef u64 dma_addr_t; typedef u32 dma_addr_t; #endif -typedef unsigned __bitwise gfp_t; -typedef unsigned __bitwise slab_flags_t; -typedef unsigned __bitwise fmode_t; +typedef unsigned int __bitwise gfp_t; +typedef unsigned int __bitwise slab_flags_t; +typedef unsigned int __bitwise fmode_t; #ifdef CONFIG_PHYS_ADDR_T_64BIT typedef u64 phys_addr_t; |