From: "tip-bot for H. Peter Anvin" <hpa@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
jesper.nilsson@axis.com, starvik@axis.com, tglx@linutronix.de
Subject: [tip:core/types] cris: Use generic posix_types.h
Date: Mon, 20 Feb 2012 13:01:49 -0800 [thread overview]
Message-ID: <tip-4d6232b3f80e1307f6e6ee32cf652b32735347fa@git.kernel.org> (raw)
In-Reply-To: <1328677745-20121-7-git-send-email-hpa@zytor.com>
Commit-ID: 4d6232b3f80e1307f6e6ee32cf652b32735347fa
Gitweb: http://git.kernel.org/tip/4d6232b3f80e1307f6e6ee32cf652b32735347fa
Author: H. Peter Anvin <hpa@zytor.com>
AuthorDate: Tue, 7 Feb 2012 21:08:50 -0800
Committer: H. Peter Anvin <hpa@zytor.com>
CommitDate: Tue, 14 Feb 2012 12:01:28 -0800
cris: Use generic posix_types.h
Change the cris architecture to use <asm-generic/posix_types.h>.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Mikael Starvik <starvik@axis.com>
Link: http://lkml.kernel.org/r/1328677745-20121-7-git-send-email-hpa@zytor.com
---
arch/cris/include/asm/posix_types.h | 50 +++++++----------------------------
1 files changed, 10 insertions(+), 40 deletions(-)
diff --git a/arch/cris/include/asm/posix_types.h b/arch/cris/include/asm/posix_types.h
index ce3fb25..72b3cd6 100644
--- a/arch/cris/include/asm/posix_types.h
+++ b/arch/cris/include/asm/posix_types.h
@@ -12,55 +12,25 @@
* assume GCC is being used.
*/
-typedef unsigned long __kernel_ino_t;
typedef unsigned short __kernel_mode_t;
+#define __kernel_mode_t __kernel_mode_t
+
typedef unsigned short __kernel_nlink_t;
-typedef long __kernel_off_t;
-typedef int __kernel_pid_t;
+#define __kernel_nlink_t __kernel_nlink_t
+
typedef unsigned short __kernel_ipc_pid_t;
+#define __kernel_ipc_pid_t __kernel_ipc_pid_t
+
typedef unsigned short __kernel_uid_t;
typedef unsigned short __kernel_gid_t;
+#define __kernel_uid_t __kernel_uid_t
+
typedef __SIZE_TYPE__ __kernel_size_t;
typedef long __kernel_ssize_t;
typedef int __kernel_ptrdiff_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;
-typedef unsigned int __kernel_uid32_t;
-typedef unsigned int __kernel_gid32_t;
+#define __kernel_size_t __kernel_size_t
-typedef unsigned short __kernel_old_uid_t;
-typedef unsigned short __kernel_old_gid_t;
typedef unsigned short __kernel_old_dev_t;
-
-#ifdef __GNUC__
-typedef long long __kernel_loff_t;
-#endif
-
-typedef struct {
- int val[2];
-} __kernel_fsid_t;
-
-#ifdef __KERNEL__
-
-#undef __FD_SET
-#define __FD_SET(fd,fdsetp) set_bit(fd, (void *)(fdsetp))
-
-#undef __FD_CLR
-#define __FD_CLR(fd,fdsetp) clear_bit(fd, (void *)(fdsetp))
-
-#undef __FD_ISSET
-#define __FD_ISSET(fd,fdsetp) test_bit(fd, (void *)(fdsetp))
-
-#undef __FD_ZERO
-#define __FD_ZERO(fdsetp) memset((void *)(fdsetp), 0, __FDSET_LONGS << 2)
-
-#endif /* __KERNEL__ */
+#define __kernel_old_dev_t __kernel_old_dev_t
#endif /* __ARCH_CRIS_POSIX_TYPES_H */
next prev parent reply other threads:[~2012-02-20 21:02 UTC|newest]
Thread overview: 75+ 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-bot for H. Peter Anvin [this message]
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 ` [PATCH 16/21] s390: " H. Peter Anvin
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=tip-4d6232b3f80e1307f6e6ee32cf652b32735347fa@git.kernel.org \
--to=hpa@zytor.com \
--cc=jesper.nilsson@axis.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=starvik@axis.com \
--cc=tglx@linutronix.de \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).