uapi: includes linux/types.h before exporting files

Some files will be exported after a following patch. 0-day tests report the
following warning/error:
./usr/include/linux/bcache.h:8: include of <linux/types.h> is preferred over <asm/types.h>
./usr/include/linux/bcache.h:11: found __[us]{8,16,32,64} type without #include <linux/types.h>
./usr/include/linux/qrtr.h:8: found __[us]{8,16,32,64} type without #include <linux/types.h>
./usr/include/linux/cryptouser.h:39: found __[us]{8,16,32,64} type without #include <linux/types.h>
./usr/include/linux/pr.h:14: found __[us]{8,16,32,64} type without #include <linux/types.h>
./usr/include/linux/btrfs_tree.h:337: found __[us]{8,16,32,64} type without #include <linux/types.h>
./usr/include/rdma/bnxt_re-abi.h:45: found __[us]{8,16,32,64} type without #include <linux/types.h>

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
index 22b6ad3..e3bb063 100644 (file)
--- a/include/uapi/linux/bcache.h
+++ b/include/uapi/linux/bcache.h
@@ -5,7 +5,7 @@
  * Bcache on disk data structures
  */
 
  * Bcache on disk data structures
  */
 

-#include <asm/types.h>
+#include <linux/types.h>

 
 #define BITMASK(name, type, field, offset, size)               \
 static inline __u64 name(const type *k)                                \
 
 #define BITMASK(name, type, field, offset, size)               \
 static inline __u64 name(const type *k)                                \

diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h
index d5ad15a..6a261cb 100644 (file)
--- a/include/uapi/linux/btrfs_tree.h
+++ b/include/uapi/linux/btrfs_tree.h
@@ -1,6 +1,8 @@
 #ifndef _BTRFS_CTREE_H_
 #define _BTRFS_CTREE_H_
 
 #ifndef _BTRFS_CTREE_H_
 #define _BTRFS_CTREE_H_
 

+#include <linux/types.h>
+

 /*
  * This header contains the structure definitions and constants used
  * by file system objects that can be retrieved using
 /*
  * This header contains the structure definitions and constants used
  * by file system objects that can be retrieved using

diff --git a/include/uapi/linux/cryptouser.h b/include/uapi/linux/cryptouser.h
index b4def5c..fdcbb3c 100644 (file)
--- a/include/uapi/linux/cryptouser.h
+++ b/include/uapi/linux/cryptouser.h
@@ -18,6 +18,8 @@
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

+#include <linux/types.h>
+

 /* Netlink configuration messages.  */
 enum {
        CRYPTO_MSG_BASE = 0x10,
 /* Netlink configuration messages.  */
 enum {
        CRYPTO_MSG_BASE = 0x10,

diff --git a/include/uapi/linux/pr.h b/include/uapi/linux/pr.h
index 57d7c0f..645ef3c 100644 (file)
--- a/include/uapi/linux/pr.h
+++ b/include/uapi/linux/pr.h
@@ -1,6 +1,8 @@
 #ifndef _UAPI_PR_H
 #define _UAPI_PR_H
 
 #ifndef _UAPI_PR_H
 #define _UAPI_PR_H
 

+#include <linux/types.h>
+

 enum pr_type {
        PR_WRITE_EXCLUSIVE              = 1,
        PR_EXCLUSIVE_ACCESS             = 2,
 enum pr_type {
        PR_WRITE_EXCLUSIVE              = 1,
        PR_EXCLUSIVE_ACCESS             = 2,

diff --git a/include/uapi/linux/qrtr.h b/include/uapi/linux/qrtr.h
index 66c0748..9d76c56 100644 (file)
--- a/include/uapi/linux/qrtr.h
+++ b/include/uapi/linux/qrtr.h
@@ -2,6 +2,7 @@
 #define _LINUX_QRTR_H
 
 #include <linux/socket.h>
 #define _LINUX_QRTR_H
 
 #include <linux/socket.h>

+#include <linux/types.h>

 
 struct sockaddr_qrtr {
        __kernel_sa_family_t sq_family;
 
 struct sockaddr_qrtr {
        __kernel_sa_family_t sq_family;

diff --git a/include/uapi/rdma/bnxt_re-abi.h b/include/uapi/rdma/bnxt_re-abi.h
index e2c8a3f..74018bd 100644 (file)
--- a/include/uapi/rdma/bnxt_re-abi.h
+++ b/include/uapi/rdma/bnxt_re-abi.h
@@ -39,6 +39,8 @@
 #ifndef __BNXT_RE_UVERBS_ABI_H__
 #define __BNXT_RE_UVERBS_ABI_H__
 
 #ifndef __BNXT_RE_UVERBS_ABI_H__
 #define __BNXT_RE_UVERBS_ABI_H__
 

+#include <linux/types.h>
+

 #define BNXT_RE_ABI_VERSION    1
 
 struct bnxt_re_uctx_resp {
 #define BNXT_RE_ABI_VERSION    1
 
 struct bnxt_re_uctx_resp {