From: "H. Peter Anvin" <hpa@zytor.com> To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Torvalds <torvalds@linux-foundation.org>, "H. Peter Anvin" <hpa@zytor.com>, Martin Schwidefsky <schwidefsky@de.ibm.com>, Heiko Carstens <heiko.carstens@de.ibm.com>, <linux390@de.ibm.com> Subject: [PATCH 16/21] s390: Use generic posix_types.h Date: Tue, 7 Feb 2012 21:09:00 -0800 [thread overview] Message-ID: <1328677745-20121-17-git-send-email-hpa@zytor.com> (raw) In-Reply-To: <1328677745-20121-1-git-send-email-hpa@zytor.com> From: "H. Peter Anvin" <hpa@zytor.com> Change the s390 architecture to use <asm-generic/posix_types.h>. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: <linux390@de.ibm.com> --- arch/s390/include/asm/posix_types.h | 70 +++++------------------------------ 1 files changed, 10 insertions(+), 60 deletions(-) diff --git a/arch/s390/include/asm/posix_types.h b/arch/s390/include/asm/posix_types.h index 8cc113f..edf8527 100644 --- a/arch/s390/include/asm/posix_types.h +++ b/arch/s390/include/asm/posix_types.h @@ -3,7 +3,6 @@ * * S390 version * - * Derived from "include/asm-i386/posix_types.h" */ #ifndef __ARCH_S390_POSIX_TYPES_H @@ -15,22 +14,11 @@ * assume GCC is being used. */ -typedef long __kernel_off_t; -typedef int __kernel_pid_t; typedef unsigned long __kernel_size_t; -typedef long __kernel_time_t; -typedef long __kernel_suseconds_t; -typedef long __kernel_clock_t; -typedef int __kernel_timer_t; -typedef int __kernel_clockid_t; -typedef int __kernel_daddr_t; -typedef char * __kernel_caddr_t; -typedef unsigned short __kernel_uid16_t; -typedef unsigned short __kernel_gid16_t; +#define __kernel_size_t __kernel_size_t -#ifdef __GNUC__ -typedef long long __kernel_loff_t; -#endif +typedef unsigned short __kernel_old_dev_t; +#define __kernel_old_dev_t __kernel_old_dev_t #ifndef __s390x__ @@ -42,11 +30,6 @@ typedef unsigned short __kernel_uid_t; typedef unsigned short __kernel_gid_t; typedef int __kernel_ssize_t; typedef int __kernel_ptrdiff_t; -typedef unsigned int __kernel_uid32_t; -typedef unsigned int __kernel_gid32_t; -typedef unsigned short __kernel_old_uid_t; -typedef unsigned short __kernel_old_gid_t; -typedef unsigned short __kernel_old_dev_t; #else /* __s390x__ */ @@ -59,49 +42,16 @@ typedef unsigned int __kernel_gid_t; typedef long __kernel_ssize_t; typedef long __kernel_ptrdiff_t; typedef unsigned long __kernel_sigset_t; /* at least 32 bits */ -typedef __kernel_uid_t __kernel_old_uid_t; -typedef __kernel_gid_t __kernel_old_gid_t; -typedef __kernel_uid_t __kernel_uid32_t; -typedef __kernel_gid_t __kernel_gid32_t; -typedef unsigned short __kernel_old_dev_t; #endif /* __s390x__ */ -typedef struct { - int val[2]; -} __kernel_fsid_t; - - -#ifdef __KERNEL__ - -#undef __FD_SET -static inline void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp) -{ - unsigned long _tmp = fd / __NFDBITS; - unsigned long _rem = fd % __NFDBITS; - fdsetp->fds_bits[_tmp] |= (1UL<<_rem); -} - -#undef __FD_CLR -static inline void __FD_CLR(unsigned long fd, __kernel_fd_set *fdsetp) -{ - unsigned long _tmp = fd / __NFDBITS; - unsigned long _rem = fd % __NFDBITS; - fdsetp->fds_bits[_tmp] &= ~(1UL<<_rem); -} - -#undef __FD_ISSET -static inline int __FD_ISSET(unsigned long fd, const __kernel_fd_set *fdsetp) -{ - unsigned long _tmp = fd / __NFDBITS; - unsigned long _rem = fd % __NFDBITS; - return (fdsetp->fds_bits[_tmp] & (1UL<<_rem)) != 0; -} - -#undef __FD_ZERO -#define __FD_ZERO(fdsetp) \ - ((void) memset ((void *) (fdsetp), 0, sizeof (__kernel_fd_set))) +#define __kernel_ino_t __kernel_ino_t +#define __kernel_mode_t __kernel_mode_t +#define __kernel_nlink_t __kernel_nlink_t +#define __kernel_ipc_pid_t __kernel_ipc_pid_t +#define __kernel_uid_t __kernel_uid_t +#define __kernel_gid_t __kernel_gid_t -#endif /* __KERNEL__ */ +#include <asm-generic/posix_types.h> #endif -- 1.7.6.5
WARNING: multiple messages have this Message-ID (diff)
From: "H. Peter Anvin" <hpa@zytor.com> To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Linus Torvalds <torvalds@linux-foundation.org>, "H. Peter Anvin" <hpa@zytor.com>, Martin Schwidefsky <schwidefsky@de.ibm.com>, Heiko Carstens <heiko.carstens@de.ibm.com>, linux390@de.ibm.com Subject: [PATCH 16/21] s390: Use generic posix_types.h Date: Tue, 7 Feb 2012 21:09:00 -0800 [thread overview] Message-ID: <1328677745-20121-17-git-send-email-hpa@zytor.com> (raw) In-Reply-To: <1328677745-20121-1-git-send-email-hpa@zytor.com> From: "H. Peter Anvin" <hpa@zytor.com> Change the s390 architecture to use <asm-generic/posix_types.h>. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: <linux390@de.ibm.com> --- arch/s390/include/asm/posix_types.h | 70 +++++------------------------------ 1 files changed, 10 insertions(+), 60 deletions(-) diff --git a/arch/s390/include/asm/posix_types.h b/arch/s390/include/asm/posix_types.h index 8cc113f..edf8527 100644 --- a/arch/s390/include/asm/posix_types.h +++ b/arch/s390/include/asm/posix_types.h @@ -3,7 +3,6 @@ * * S390 version * - * Derived from "include/asm-i386/posix_types.h" */ #ifndef __ARCH_S390_POSIX_TYPES_H @@ -15,22 +14,11 @@ * assume GCC is being used. */ -typedef long __kernel_off_t; -typedef int __kernel_pid_t; typedef unsigned long __kernel_size_t; -typedef long __kernel_time_t; -typedef long __kernel_suseconds_t; -typedef long __kernel_clock_t; -typedef int __kernel_timer_t; -typedef int __kernel_clockid_t; -typedef int __kernel_daddr_t; -typedef char * __kernel_caddr_t; -typedef unsigned short __kernel_uid16_t; -typedef unsigned short __kernel_gid16_t; +#define __kernel_size_t __kernel_size_t -#ifdef __GNUC__ -typedef long long __kernel_loff_t; -#endif +typedef unsigned short __kernel_old_dev_t; +#define __kernel_old_dev_t __kernel_old_dev_t #ifndef __s390x__ @@ -42,11 +30,6 @@ typedef unsigned short __kernel_uid_t; typedef unsigned short __kernel_gid_t; typedef int __kernel_ssize_t; typedef int __kernel_ptrdiff_t; -typedef unsigned int __kernel_uid32_t; -typedef unsigned int __kernel_gid32_t; -typedef unsigned short __kernel_old_uid_t; -typedef unsigned short __kernel_old_gid_t; -typedef unsigned short __kernel_old_dev_t; #else /* __s390x__ */ @@ -59,49 +42,16 @@ typedef unsigned int __kernel_gid_t; typedef long __kernel_ssize_t; typedef long __kernel_ptrdiff_t; typedef unsigned long __kernel_sigset_t; /* at least 32 bits */ -typedef __kernel_uid_t __kernel_old_uid_t; -typedef __kernel_gid_t __kernel_old_gid_t; -typedef __kernel_uid_t __kernel_uid32_t; -typedef __kernel_gid_t __kernel_gid32_t; -typedef unsigned short __kernel_old_dev_t; #endif /* __s390x__ */ -typedef struct { - int val[2]; -} __kernel_fsid_t; - - -#ifdef __KERNEL__ - -#undef __FD_SET -static inline void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp) -{ - unsigned long _tmp = fd / __NFDBITS; - unsigned long _rem = fd % __NFDBITS; - fdsetp->fds_bits[_tmp] |= (1UL<<_rem); -} - -#undef __FD_CLR -static inline void __FD_CLR(unsigned long fd, __kernel_fd_set *fdsetp) -{ - unsigned long _tmp = fd / __NFDBITS; - unsigned long _rem = fd % __NFDBITS; - fdsetp->fds_bits[_tmp] &= ~(1UL<<_rem); -} - -#undef __FD_ISSET -static inline int __FD_ISSET(unsigned long fd, const __kernel_fd_set *fdsetp) -{ - unsigned long _tmp = fd / __NFDBITS; - unsigned long _rem = fd % __NFDBITS; - return (fdsetp->fds_bits[_tmp] & (1UL<<_rem)) != 0; -} - -#undef __FD_ZERO -#define __FD_ZERO(fdsetp) \ - ((void) memset ((void *) (fdsetp), 0, sizeof (__kernel_fd_set))) +#define __kernel_ino_t __kernel_ino_t +#define __kernel_mode_t __kernel_mode_t +#define __kernel_nlink_t __kernel_nlink_t +#define __kernel_ipc_pid_t __kernel_ipc_pid_t +#define __kernel_uid_t __kernel_uid_t +#define __kernel_gid_t __kernel_gid_t -#endif /* __KERNEL__ */ +#include <asm-generic/posix_types.h> #endif -- 1.7.6.5
next prev parent reply other threads:[~2012-02-08 5:10 UTC|newest] Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-02-08 5:08 [PATCH 00/21] RFC: Make all arches use <asm-generic/posix_types.h> H. Peter Anvin 2012-02-08 5:08 ` H. Peter Anvin 2012-02-08 5:08 ` [PATCH 01/21] posix_types: Make __kernel_[ug]id32_t default to unsigned int H. Peter Anvin 2012-02-20 20:57 ` [tip:core/types] posix_types: Make __kernel_[ug] id32_t " tip-bot for H. Peter Anvin 2012-02-08 5:08 ` [PATCH 02/21] posix_types: Make it possible to override __kernel_fsid_t H. Peter Anvin 2012-02-20 20:58 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:08 ` [PATCH 03/21] alpha: Use generic posix_types.h H. Peter Anvin 2012-02-20 20:59 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:08 ` [PATCH 04/21] arm: " H. Peter Anvin 2012-02-09 0:57 ` Russell King - ARM Linux 2012-02-20 21:00 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:08 ` [PATCH 05/21] avr32: " H. Peter Anvin 2012-02-20 21:01 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:08 ` [PATCH 06/21] cris: " H. Peter Anvin 2012-02-08 13:21 ` Jesper Nilsson 2012-02-20 21:01 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:08 ` [PATCH 07/21] frv: " H. Peter Anvin 2012-02-20 21:02 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:08 ` [PATCH 08/21] h8300: " H. Peter Anvin 2012-02-20 21:03 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:08 ` [PATCH 09/21] ia64: " H. Peter Anvin 2012-02-20 21:04 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:08 ` [PATCH 10/21] m32r: " H. Peter Anvin 2012-02-20 21:05 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:08 ` [PATCH 11/21] m68k: " H. Peter Anvin 2012-02-19 10:28 ` Geert Uytterhoeven 2012-02-20 21:05 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:08 ` [PATCH 12/21] mips: " H. Peter Anvin 2012-02-20 21:06 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:08 ` [PATCH 13/21] mn10300: " H. Peter Anvin 2012-02-20 21:07 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:08 ` [PATCH 14/21] parisc: " H. Peter Anvin 2012-02-20 21:08 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:08 ` [PATCH 15/21] powerpc: " H. Peter Anvin 2012-02-09 6:14 ` Benjamin Herrenschmidt 2012-02-20 21:09 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:09 ` H. Peter Anvin [this message] 2012-02-08 5:09 ` [PATCH 16/21] s390: " H. Peter Anvin 2012-02-08 9:04 ` Martin Schwidefsky 2012-02-08 9:04 ` Martin Schwidefsky 2012-02-08 16:55 ` H. Peter Anvin 2012-02-08 18:01 ` Martin Schwidefsky 2012-02-20 21:09 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:09 ` [PATCH 17/21] sh: Remove unnecessary posix_types.h type overrides H. Peter Anvin 2012-02-20 21:10 ` [tip:core/types] sh: Remove unnecessary posix_types. h " tip-bot for H. Peter Anvin 2012-02-08 5:09 ` [PATCH 18/21] sparc: Use generic posix_types.h H. Peter Anvin 2012-02-09 1:27 ` David Miller 2012-02-20 21:11 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:09 ` [PATCH 19/21] x86: " H. Peter Anvin 2012-02-20 21:12 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:09 ` [PATCH 20/21] xtensa: " H. Peter Anvin 2012-02-20 21:13 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 5:09 ` [PATCH 21/21] posix_types: Remove fd_set macros H. Peter Anvin 2012-02-20 21:13 ` [tip:core/types] " tip-bot for H. Peter Anvin 2012-02-08 12:20 ` [PATCH 21/21] " David Howells 2012-02-08 16:57 ` H. Peter Anvin 2012-02-08 21:24 ` David Howells 2012-02-08 21:30 ` H. Peter Anvin 2012-02-14 18:59 ` Tony Luck 2012-02-14 19:18 ` David Howells 2012-02-14 19:44 ` H. Peter Anvin 2012-02-14 20:14 ` H. Peter Anvin 2012-02-16 13:42 ` [PATCH 20/21] xtensa: Use generic posix_types.h David Howells 2012-02-16 17:45 ` Marc Gauthier 2012-02-16 13:44 ` [PATCH 13/21] mn10300: " David Howells 2012-02-16 13:44 ` [PATCH 15/21] powerpc: " David Howells 2012-02-16 20:26 ` Benjamin Herrenschmidt 2012-02-16 20:58 ` H. Peter Anvin 2012-02-16 17:49 ` [PATCH 0/3] Eliminating __FD_*() functions from the kernel David Howells 2012-02-16 17:49 ` [PATCH 1/3] Wrap accesses to the fd_sets in struct fdtable David Howells 2012-02-20 21:14 ` [tip:core/types] " tip-bot for David Howells 2012-02-16 17:49 ` [PATCH 2/3] Replace the fd_sets in struct fdtable with an array of unsigned longs David Howells 2012-02-20 21:15 ` [tip:core/types] " tip-bot for David Howells 2012-02-16 17:50 ` [PATCH 3/3] Delete the __FD_*() funcs for operating on fd_set from linux/time.h David Howells 2012-02-20 21:16 ` [tip:core/types] " tip-bot for David Howells 2012-02-20 21:12 ` [PATCH 13/21] mn10300: Use generic posix_types.h David Howells 2012-02-20 21:12 ` [PATCH 07/21] frv: " David Howells
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1328677745-20121-17-git-send-email-hpa@zytor.com \ --to=hpa@zytor.com \ --cc=heiko.carstens@de.ibm.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux390@de.ibm.com \ --cc=schwidefsky@de.ibm.com \ --cc=torvalds@linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.