h8300: move definition of __kernel_size_t etc. to posix_types.h

Message ID 20190723102106.11375-1-yamada.masahiro@socionext.com
State Accepted
Commit c9ee4bf9e0f5e353ae1c81ee30a373b6653329d7
Headers show
Series
  • h8300: move definition of __kernel_size_t etc. to posix_types.h
Related show

Commit Message

Masahiro Yamada July 23, 2019, 10:21 a.m.
These types should be defined in posix_types.h, not in bitsperlong.h .

With these defines moved, h8300-specific bitsperlong.h is no longer
needed since Kbuild will automatically create a wrapper of
include/uapi/asm-generic/bitsperlong.h

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

---

 arch/h8300/include/uapi/asm/bitsperlong.h | 15 ---------------
 arch/h8300/include/uapi/asm/posix_types.h | 13 +++++++++++++
 2 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h
 create mode 100644 arch/h8300/include/uapi/asm/posix_types.h

-- 
2.17.1

Comments

Yoshinori Sato July 27, 2019, 1:46 p.m. | #1
On Tue, 23 Jul 2019 19:21:06 +0900,
Masahiro Yamada wrote:
> 

> These types should be defined in posix_types.h, not in bitsperlong.h .

> 

> With these defines moved, h8300-specific bitsperlong.h is no longer

> needed since Kbuild will automatically create a wrapper of

> include/uapi/asm-generic/bitsperlong.h

> 

> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

> ---

> 

>  arch/h8300/include/uapi/asm/bitsperlong.h | 15 ---------------

>  arch/h8300/include/uapi/asm/posix_types.h | 13 +++++++++++++

>  2 files changed, 13 insertions(+), 15 deletions(-)

>  delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h

>  create mode 100644 arch/h8300/include/uapi/asm/posix_types.h

> 

> diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h

> deleted file mode 100644

> index a33e358f1c1b..000000000000

> --- a/arch/h8300/include/uapi/asm/bitsperlong.h

> +++ /dev/null

> @@ -1,15 +0,0 @@

> -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

> -#ifndef _UAPI__ASM_H8300_BITS_PER_LONG

> -#define _UAPI__ASM_H8300_BITS_PER_LONG

> -

> -#include <asm-generic/bitsperlong.h>

> -

> -#if !defined(__ASSEMBLY__)

> -/* h8300-unknown-linux required long */

> -#define __kernel_size_t __kernel_size_t

> -typedef unsigned long	__kernel_size_t;

> -typedef long		__kernel_ssize_t;

> -typedef long		__kernel_ptrdiff_t;

> -#endif

> -

> -#endif /* _UAPI__ASM_H8300_BITS_PER_LONG */

> diff --git a/arch/h8300/include/uapi/asm/posix_types.h b/arch/h8300/include/uapi/asm/posix_types.h

> new file mode 100644

> index 000000000000..3efc9dd59476

> --- /dev/null

> +++ b/arch/h8300/include/uapi/asm/posix_types.h

> @@ -0,0 +1,13 @@

> +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */

> +#ifndef _UAPI_ASM_POSIX_TYPES_H

> +#define _UAPI_ASM_POSIX_TYPES_H

> +

> +/* h8300-unknown-linux required long */

> +#define __kernel_size_t __kernel_size_t

> +typedef unsigned long	__kernel_size_t;

> +typedef long		__kernel_ssize_t;

> +typedef long		__kernel_ptrdiff_t;

> +

> +#include <asm-generic/posix_types.h>

> +

> +#endif /* _UAPI_ASM_POSIX_TYPES_H */

> -- 

> 2.17.1

> 


Applied h8300-next.
Thanks.

-- 
Yosinori Sato

Patch

diff --git a/arch/h8300/include/uapi/asm/bitsperlong.h b/arch/h8300/include/uapi/asm/bitsperlong.h
deleted file mode 100644
index a33e358f1c1b..000000000000
--- a/arch/h8300/include/uapi/asm/bitsperlong.h
+++ /dev/null
@@ -1,15 +0,0 @@ 
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _UAPI__ASM_H8300_BITS_PER_LONG
-#define _UAPI__ASM_H8300_BITS_PER_LONG
-
-#include <asm-generic/bitsperlong.h>
-
-#if !defined(__ASSEMBLY__)
-/* h8300-unknown-linux required long */
-#define __kernel_size_t __kernel_size_t
-typedef unsigned long	__kernel_size_t;
-typedef long		__kernel_ssize_t;
-typedef long		__kernel_ptrdiff_t;
-#endif
-
-#endif /* _UAPI__ASM_H8300_BITS_PER_LONG */
diff --git a/arch/h8300/include/uapi/asm/posix_types.h b/arch/h8300/include/uapi/asm/posix_types.h
new file mode 100644
index 000000000000..3efc9dd59476
--- /dev/null
+++ b/arch/h8300/include/uapi/asm/posix_types.h
@@ -0,0 +1,13 @@ 
+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
+#ifndef _UAPI_ASM_POSIX_TYPES_H
+#define _UAPI_ASM_POSIX_TYPES_H
+
+/* h8300-unknown-linux required long */
+#define __kernel_size_t __kernel_size_t
+typedef unsigned long	__kernel_size_t;
+typedef long		__kernel_ssize_t;
+typedef long		__kernel_ptrdiff_t;
+
+#include <asm-generic/posix_types.h>
+
+#endif /* _UAPI_ASM_POSIX_TYPES_H */