Skip to contentSkip to conversation

x86: headers fixes

PATCH Superseded Jaswinder Singh Rajput 3 participants 20 messages Jun 18, 2009 – Jun 20, 2009 x86

lore
Share & tools
lore
#0 lore raw

cover x86: headers fixes

Ingo,

Please pull these header fixes :

The following changes since commit 528c2552eda807e829e84d6ca1b849ae7ca47b0d:
Ingo Molnar (1):
Merge branch 'out-of-tree'

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-top.git master

Jaswinder Singh Rajput (5):
x86: asm/posix_types.h common for kernel and user space
x86: move common typedefs to asm/posix_types.h
x86: asm/unistd.h common for kernel and user space
x86: asm/termios.h remove irrelevant comment for userspace
x86: asm/types.h remove irrelevant comment for userspace

 arch/x86/include/asm/posix_types.h    |   47 ++++++++++++++++++++++++++------
 arch/x86/include/asm/posix_types_32.h |   31 ---------------------
 arch/x86/include/asm/posix_types_64.h |   32 ----------------------
 arch/x86/include/asm/termios.h        |   25 ++++++++---------
 arch/x86/include/asm/types.h          |    3 +-
 arch/x86/include/asm/unistd.h         |   15 ++++------
 6 files changed, 57 insertions(+), 96 deletions(-)

Complete diff :

arch/x86/include/asm/posix_types.h +38 -9
index bb7133d..8fb98cc 100644
@@ -1,13 +1,42 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "posix_types_32.h"
-# else
-#  include "posix_types_64.h"
-# endif
-#else
-# ifdef __i386__
+#ifndef _ASM_X86_POSIX_TYPES_H
+#define _ASM_X86_POSIX_TYPES_H
+
+/*
+ * This file is generally used by user-level software, so you need to
+ * be a little careful about namespace pollution etc.  Also, we cannot
+ * assume GCC is being used.
+ */
+
+typedef unsigned long	__kernel_ino_t;
+typedef long		__kernel_off_t;
+typedef int		__kernel_pid_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;
+
+typedef unsigned short	__kernel_old_uid_t;
+typedef unsigned short	__kernel_old_gid_t;
+
+#ifdef __GNUC__
+typedef long long	__kernel_loff_t;
+#endif
+
+typedef struct {
+	int	val[2];
+} __kernel_fsid_t;
+
+# if defined(CONFIG_X86_32) || defined(__i386__)
 #  include "posix_types_32.h"
 # else
 #  include "posix_types_64.h"
 # endif
-#endif
+
+#endif /* _ASM_X86_POSIX_TYPES_H */
arch/x86/include/asm/posix_types_32.h +0 -31
index f7d9adf..bc5958e 100644
@@ -1,47 +1,17 @@
 #ifndef _ASM_X86_POSIX_TYPES_32_H
 #define _ASM_X86_POSIX_TYPES_32_H
 
-/*
- * This file is generally used by user-level software, so you need to
- * be a little careful about namespace pollution etc.  Also, we cannot
- * assume GCC is being used.
- */
-
-typedef unsigned long	__kernel_ino_t;
 typedef unsigned short	__kernel_mode_t;
 typedef unsigned short	__kernel_nlink_t;
-typedef long		__kernel_off_t;
-typedef int		__kernel_pid_t;
 typedef unsigned short	__kernel_ipc_pid_t;
 typedef unsigned short	__kernel_uid_t;
 typedef unsigned short	__kernel_gid_t;
 typedef unsigned int	__kernel_size_t;
 typedef int		__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;
 
-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;
-
 #if defined(__KERNEL__)
 
 #undef	__FD_SET
@@ -81,5 +51,4 @@ do {								\
 } while (0)
 
 #endif /* defined(__KERNEL__) */
-
 #endif /* _ASM_X86_POSIX_TYPES_32_H */
arch/x86/include/asm/posix_types_64.h +0 -32
index eb8d2d9..3840927 100644
@@ -1,45 +1,14 @@
 #ifndef _ASM_X86_POSIX_TYPES_64_H
 #define _ASM_X86_POSIX_TYPES_64_H
 
-/*
- * This file is generally used by user-level software, so you need to
- * be a little careful about namespace pollution etc.  Also, we cannot
- * assume GCC is being used.
- */
-
-typedef unsigned long	__kernel_ino_t;
 typedef unsigned int	__kernel_mode_t;
 typedef unsigned long	__kernel_nlink_t;
-typedef long		__kernel_off_t;
-typedef int		__kernel_pid_t;
 typedef int		__kernel_ipc_pid_t;
 typedef unsigned int	__kernel_uid_t;
 typedef unsigned int	__kernel_gid_t;
 typedef unsigned long	__kernel_size_t;
 typedef long		__kernel_ssize_t;
 typedef long		__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;
-
-#ifdef __GNUC__
-typedef long long	__kernel_loff_t;
-#endif
-
-typedef struct {
-	int	val[2];
-} __kernel_fsid_t;
-
-typedef unsigned short __kernel_old_uid_t;
-typedef unsigned short __kernel_old_gid_t;
-typedef __kernel_uid_t __kernel_uid32_t;
-typedef __kernel_gid_t __kernel_gid32_t;
 
 typedef unsigned long	__kernel_old_dev_t;
 
@@ -115,5 +84,4 @@ static inline void __FD_ZERO(__kernel_fd_set *p)
 }
 
 #endif /* defined(__KERNEL__) */
-
 #endif /* _ASM_X86_POSIX_TYPES_64_H */
arch/x86/include/asm/termios.h +12 -13
index c4ee805..ee6f0c8 100644
@@ -5,20 +5,20 @@
 #include <asm/ioctls.h>
 
 struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
+	unsigned short	ws_row;
+	unsigned short	ws_col;
+	unsigned short	ws_xpixel;
+	unsigned short	ws_ypixel;
 };
 
 #define NCC 8
 struct termio {
-	unsigned short c_iflag;		/* input mode flags */
-	unsigned short c_oflag;		/* output mode flags */
-	unsigned short c_cflag;		/* control mode flags */
-	unsigned short c_lflag;		/* local mode flags */
-	unsigned char c_line;		/* line discipline */
-	unsigned char c_cc[NCC];	/* control characters */
+	unsigned short	c_iflag;	/* input mode flags	*/
+	unsigned short	c_oflag;	/* output mode flags	*/
+	unsigned short	c_cflag;	/* control mode flags	*/
+	unsigned short	c_lflag;	/* local mode flags	*/
+	unsigned char	c_line;		/* line discipline	*/
+	unsigned char	c_cc[NCC];	/* control characters	*/
 };
 
 /* modem lines */
@@ -37,10 +37,10 @@ struct termio {
 #define TIOCM_OUT2	0x4000
 #define TIOCM_LOOP	0x8000
 
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
 #ifdef __KERNEL__
 
+/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
+
 #include <asm/uaccess.h>
 
 /*	intr=^C		quit=^\		erase=del	kill=^U
@@ -110,5 +110,4 @@ static inline int kernel_termios_to_user_termios_1(struct termios __user *u,
 }
 
 #endif	/* __KERNEL__ */
-
 #endif /* _ASM_X86_TERMIOS_H */
arch/x86/include/asm/types.h +1 -2
index 09b9774..bebc9f3 100644
@@ -9,10 +9,10 @@ typedef unsigned short umode_t;
 
 #endif /* __ASSEMBLY__ */
 
+#ifdef __KERNEL__
 /*
  * These aren't exported outside the kernel to avoid name space clashes
  */
-#ifdef __KERNEL__
 
 #ifndef __ASSEMBLY__
 
@@ -26,5 +26,4 @@ typedef u32 dma_addr_t;
 
 #endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
-
 #endif /* _ASM_X86_TYPES_H */
arch/x86/include/asm/unistd.h +6 -9
index 2a58ed3..0de8cb3 100644
@@ -1,13 +1,10 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
+#ifndef _ASM_X86_UNISTD_H
+#define _ASM_X86_UNISTD_H
+
+# if defined(CONFIG_X86_32) || defined(__i386__)
 #  include "unistd_32.h"
 # else
 #  include "unistd_64.h"
 # endif
-#else
-# ifdef __i386__
-#  include "unistd_32.h"
-# else
-#  include "unistd_64.h"
-# endif
-#endif
+
+#endif /* _ASM_X86_UNISTD_H */
#1 lore raw

PATCH 1/5 x86: asm/posix_types.h common for kernel and user space

Make asm/posix_types.h common for kernel and user space.

Also defined _ASM_X86_POSIX_TYPES_H

---
 arch/x86/include/asm/posix_types.h |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)
arch/x86/include/asm/posix_types.h +6 -9
index bb7133d..cb0a581 100644
@@ -1,13 +1,10 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
+#ifndef _ASM_X86_POSIX_TYPES_H
+#define _ASM_X86_POSIX_TYPES_H
+
+# if defined(CONFIG_X86_32) || defined(__i386__)
 #  include "posix_types_32.h"
 # else
 #  include "posix_types_64.h"
 # endif
-#else
-# ifdef __i386__
-#  include "posix_types_32.h"
-# else
-#  include "posix_types_64.h"
-# endif
-#endif
+
+#endif /* _ASM_X86_POSIX_TYPES_H */
Signature · 1 line
1.6.0.6
#2 lore raw

PATCH 2/5 x86: move common typedefs to asm/posix_types.h

Move common typedefs to asm/posix_types.h for easy maintenance

---
 arch/x86/include/asm/posix_types.h    |   32 ++++++++++++++++++++++++++++++++
 arch/x86/include/asm/posix_types_32.h |   31 -------------------------------
 arch/x86/include/asm/posix_types_64.h |   32 --------------------------------
 3 files changed, 32 insertions(+), 63 deletions(-)
arch/x86/include/asm/posix_types.h +32 -0
index cb0a581..8fb98cc 100644
@@ -1,6 +1,38 @@
 #ifndef _ASM_X86_POSIX_TYPES_H
 #define _ASM_X86_POSIX_TYPES_H
 
+/*
+ * This file is generally used by user-level software, so you need to
+ * be a little careful about namespace pollution etc.  Also, we cannot
+ * assume GCC is being used.
+ */
+
+typedef unsigned long	__kernel_ino_t;
+typedef long		__kernel_off_t;
+typedef int		__kernel_pid_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;
+
+typedef unsigned short	__kernel_old_uid_t;
+typedef unsigned short	__kernel_old_gid_t;
+
+#ifdef __GNUC__
+typedef long long	__kernel_loff_t;
+#endif
+
+typedef struct {
+	int	val[2];
+} __kernel_fsid_t;
+
 # if defined(CONFIG_X86_32) || defined(__i386__)
 #  include "posix_types_32.h"
 # else
arch/x86/include/asm/posix_types_32.h +0 -31
index f7d9adf..bc5958e 100644
@@ -1,47 +1,17 @@
 #ifndef _ASM_X86_POSIX_TYPES_32_H
 #define _ASM_X86_POSIX_TYPES_32_H
 
-/*
- * This file is generally used by user-level software, so you need to
- * be a little careful about namespace pollution etc.  Also, we cannot
- * assume GCC is being used.
- */
-
-typedef unsigned long	__kernel_ino_t;
 typedef unsigned short	__kernel_mode_t;
 typedef unsigned short	__kernel_nlink_t;
-typedef long		__kernel_off_t;
-typedef int		__kernel_pid_t;
 typedef unsigned short	__kernel_ipc_pid_t;
 typedef unsigned short	__kernel_uid_t;
 typedef unsigned short	__kernel_gid_t;
 typedef unsigned int	__kernel_size_t;
 typedef int		__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;
 
-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;
-
 #if defined(__KERNEL__)
 
 #undef	__FD_SET
@@ -81,5 +51,4 @@ do {								\
 } while (0)
 
 #endif /* defined(__KERNEL__) */
-
 #endif /* _ASM_X86_POSIX_TYPES_32_H */
arch/x86/include/asm/posix_types_64.h +0 -32
index eb8d2d9..3840927 100644
@@ -1,45 +1,14 @@
 #ifndef _ASM_X86_POSIX_TYPES_64_H
 #define _ASM_X86_POSIX_TYPES_64_H
 
-/*
- * This file is generally used by user-level software, so you need to
- * be a little careful about namespace pollution etc.  Also, we cannot
- * assume GCC is being used.
- */
-
-typedef unsigned long	__kernel_ino_t;
 typedef unsigned int	__kernel_mode_t;
 typedef unsigned long	__kernel_nlink_t;
-typedef long		__kernel_off_t;
-typedef int		__kernel_pid_t;
 typedef int		__kernel_ipc_pid_t;
 typedef unsigned int	__kernel_uid_t;
 typedef unsigned int	__kernel_gid_t;
 typedef unsigned long	__kernel_size_t;
 typedef long		__kernel_ssize_t;
 typedef long		__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;
-
-#ifdef __GNUC__
-typedef long long	__kernel_loff_t;
-#endif
-
-typedef struct {
-	int	val[2];
-} __kernel_fsid_t;
-
-typedef unsigned short __kernel_old_uid_t;
-typedef unsigned short __kernel_old_gid_t;
-typedef __kernel_uid_t __kernel_uid32_t;
-typedef __kernel_gid_t __kernel_gid32_t;
 
 typedef unsigned long	__kernel_old_dev_t;
 
@@ -115,5 +84,4 @@ static inline void __FD_ZERO(__kernel_fd_set *p)
 }
 
 #endif /* defined(__KERNEL__) */
-
 #endif /* _ASM_X86_POSIX_TYPES_64_H */
Signature · 1 line
1.6.0.6
#3 lore raw

PATCH 3/5 x86: asm/unistd.h common for kernel and user space

Make asm/unistd.h common for kernel and user space.

Also defined _ASM_X86_UNISTD_H

---
 arch/x86/include/asm/unistd.h |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)
arch/x86/include/asm/unistd.h +6 -9
index 2a58ed3..0de8cb3 100644
@@ -1,13 +1,10 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
+#ifndef _ASM_X86_UNISTD_H
+#define _ASM_X86_UNISTD_H
+
+# if defined(CONFIG_X86_32) || defined(__i386__)
 #  include "unistd_32.h"
 # else
 #  include "unistd_64.h"
 # endif
-#else
-# ifdef __i386__
-#  include "unistd_32.h"
-# else
-#  include "unistd_64.h"
-# endif
-#endif
+
+#endif /* _ASM_X86_UNISTD_H */
Signature · 1 line
1.6.0.6
#4 lore raw

PATCH 4/5 x86: asm/termios.h remove irrelevant comment for userspace

following comment is irrelevant at usr/include/asm/termios.h :

/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */

Also fixed some alignment and space issues.

---
 arch/x86/include/asm/termios.h |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)
arch/x86/include/asm/termios.h +12 -13
index c4ee805..ee6f0c8 100644
@@ -5,20 +5,20 @@
 #include <asm/ioctls.h>
 
 struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
+	unsigned short	ws_row;
+	unsigned short	ws_col;
+	unsigned short	ws_xpixel;
+	unsigned short	ws_ypixel;
 };
 
 #define NCC 8
 struct termio {
-	unsigned short c_iflag;		/* input mode flags */
-	unsigned short c_oflag;		/* output mode flags */
-	unsigned short c_cflag;		/* control mode flags */
-	unsigned short c_lflag;		/* local mode flags */
-	unsigned char c_line;		/* line discipline */
-	unsigned char c_cc[NCC];	/* control characters */
+	unsigned short	c_iflag;	/* input mode flags	*/
+	unsigned short	c_oflag;	/* output mode flags	*/
+	unsigned short	c_cflag;	/* control mode flags	*/
+	unsigned short	c_lflag;	/* local mode flags	*/
+	unsigned char	c_line;		/* line discipline	*/
+	unsigned char	c_cc[NCC];	/* control characters	*/
 };
 
 /* modem lines */
@@ -37,10 +37,10 @@ struct termio {
 #define TIOCM_OUT2	0x4000
 #define TIOCM_LOOP	0x8000
 
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
 #ifdef __KERNEL__
 
+/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
+
 #include <asm/uaccess.h>
 
 /*	intr=^C		quit=^\		erase=del	kill=^U
@@ -110,5 +110,4 @@ static inline int kernel_termios_to_user_termios_1(struct termios __user *u,
 }
 
 #endif	/* __KERNEL__ */
-
 #endif /* _ASM_X86_TERMIOS_H */
Signature · 1 line
1.6.0.6
#5 lore raw

PATCH 5/5 x86: asm/types.h remove irrelevant comment for userspace

following comment is irrelevant at usr/include/asm/types.h :

"These aren't exported outside the kernel to avoid name space clashes"

Also fixed some spacing issues in usr/include/asm/types.h

---
 arch/x86/include/asm/types.h |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
arch/x86/include/asm/types.h +1 -2
index 09b9774..bebc9f3 100644
@@ -9,10 +9,10 @@ typedef unsigned short umode_t;
 
 #endif /* __ASSEMBLY__ */
 
+#ifdef __KERNEL__
 /*
  * These aren't exported outside the kernel to avoid name space clashes
  */
-#ifdef __KERNEL__
 
 #ifndef __ASSEMBLY__
 
@@ -26,5 +26,4 @@ typedef u32 dma_addr_t;
 
 #endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
-
 #endif /* _ASM_X86_TYPES_H */
Signature · 1 line
1.6.0.6
#6 lore raw

Re: [PATCH 2/5 -tip] x86: move common typedefs to asm/posix_types.h

In reply to Jaswinder Singh Rajput
Quoted 2 lines · Jaswinder Singh Rajput

Move common typedefs to asm/posix_types.h for easy maintenance

I think at this point it would be cleaner to also move the differing ones into asm/posix_types.h so that there's just one file to look at for the types.

#7 lore raw

Re: [PATCH 2/5 -tip] x86: move common typedefs to asm/posix_types.h

Quoted 8 lines · Christoph Hellwig
Quoted 2 lines · Jaswinder Singh Rajput

Move common typedefs to asm/posix_types.h for easy maintenance

I think at this point it would be cleaner to also move the differing ones into asm/posix_types.h so that there's just one file to look at for the types.

Agreed.

Because of the new asm-gneeric headers, you can also #include <asm-generic/posix_types.h> for any of the default types and only override the ones that are x86-specific.

arch/x86/include/asm/posix_types.h +88 -13
dissimilarity index 94%
index bb7133d..980736c 100644
@@ -1,13 +1,88 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "posix_types_32.h"
-# else
-#  include "posix_types_64.h"
-# endif
-#else
-# ifdef __i386__
-#  include "posix_types_32.h"
-# else
-#  include "posix_types_64.h"
-# endif
-#endif
+#ifndef _ASM_X86_POSIX_TYPES_H
+#define _ASM_X86_POSIX_TYPES_H
+
+#ifdef __x86_64__
+/*
+ * These types are different on x86_64 from the asm-generic version
+ */
+#define __kernel_old_uid_t __kernel_old_uid_t
+typedef unsigned short	__kernel_old_uid_t;
+typedef unsigned short	__kernel_old_gid_t;
+
+#define __kernel_old_dev_t __kernel_old_dev_t
+typedef unsigned long	__kernel_old_dev_t;
+
+#else
+/*
+ * These types are different on x86_32 from the asm-generic version
+ */
+#define __kernel_mode_t __kernel_mode_t
+typedef unsigned short	__kernel_mode_t;
+
+#define __kernel_nlink_t __kernel_nlink_t
+typedef unsigned short	__kernel_nlink_t;
+
+#define __kernel_ipc_pid_t __kernel_ipc_pid_t
+typedef unsigned short	__kernel_ipc_pid_t;
+
+#define __kernel_uid_t __kernel_uid_t
+typedef unsigned short	__kernel_uid_t;
+typedef unsigned short	__kernel_gid_t;
+
+#define __kernel_uid32_t __kernel_uid32_t
+typedef unsigned int	__kernel_uid32_t;
+typedef unsigned int	__kernel_gid32_t;
+
+#define __kernel_old_uid_t __kernel_old_uid_t
+typedef unsigned short	__kernel_old_uid_t;
+typedef unsigned short	__kernel_old_gid_t;
+
+#define __kernel_old_dev_t __kernel_old_dev_t
+typedef unsigned short	__kernel_old_dev_t;
+
+#endif
+
+#include <asm-generic/posix_types.h>
+
+#if defined(__KERNEL__)
+#ifndef CONFIG_X86_64
+
+#undef	__FD_SET
+#define __FD_SET(fd,fdsetp)					\
+	asm volatile("btsl %1,%0":				\
+		     "+m" (*(__kernel_fd_set *)(fdsetp))	\
+		     : "r" ((int)(fd)))
+
+#undef	__FD_CLR
+#define __FD_CLR(fd,fdsetp)					\
+	asm volatile("btrl %1,%0":				\
+		     "+m" (*(__kernel_fd_set *)(fdsetp))	\
+		     : "r" ((int) (fd)))
+
+#undef	__FD_ISSET
+#define __FD_ISSET(fd,fdsetp)					\
+	(__extension__						\
+	 ({							\
+	 unsigned char __result;				\
+	 asm volatile("btl %1,%2 ; setb %0"			\
+		      : "=q" (__result)				\
+		      : "r" ((int)(fd)),			\
+			"m" (*(__kernel_fd_set *)(fdsetp)));	\
+	 __result;						\
+}))
+
+#undef	__FD_ZERO
+#define __FD_ZERO(fdsetp)					\
+do {								\
+	int __d0, __d1;						\
+	asm volatile("cld ; rep ; stosl"			\
+		     : "=m" (*(__kernel_fd_set *)(fdsetp)),	\
+		       "=&c" (__d0), "=&D" (__d1)		\
+		     : "a" (0), "1" (__FDSET_LONGS),		\
+		       "2" ((__kernel_fd_set *)(fdsetp))	\
+		     : "memory");				\
+} while (0)
+#endif /* CONFIG_X86_64 */
+#endif /* defined(__KERNEL__) */
+
+#endif /* _ASM_X86_POSIX_TYPES_H */
#8 lore raw

Re: [PATCH 2/5 -tip] x86: move common typedefs to asm/posix_types.h

Quoted 10 lines · Arnd Bergmann
Quoted 8 lines · Christoph Hellwig
Quoted 2 lines · Jaswinder Singh Rajput

Move common typedefs to asm/posix_types.h for easy maintenance

I think at this point it would be cleaner to also move the differing ones into asm/posix_types.h so that there's just one file to look at for the types.

Quoted 8 lines

Agreed.

Because of the new asm-gneeric headers, you can also #include <asm-generic/posix_types.h> for any of the default types and only override the ones that are x86-specific.

Thanks, Arnd.

I will prepare new patch/pull-request by adding this patch.

--
JSR

#9 lore raw

v2 cover x86: headers fixes

In reply to Jaswinder Singh Rajput

Ingo,

Please pull X86 headers fixes patches.

The following changes since commit ce46441b95bcde36649a17d053dc7dc76272f539:
Ingo Molnar (1):
Merge branch 'perfcounters/core'

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-top.git master

Jaswinder Singh Rajput (4):
x86: unification of posix_types.h
x86: asm/unistd.h common for kernel and user space
x86: asm/termios.h remove irrelevant comment for userspace
x86: asm/types.h remove irrelevant comment for userspace

 arch/x86/include/asm/Kbuild           |    2 -
 arch/x86/include/asm/posix_types.h    |   96 +++++++++++++++++++++++---
 arch/x86/include/asm/posix_types_32.h |   85 -----------------------
 arch/x86/include/asm/posix_types_64.h |  119 ---------------------------------
 arch/x86/include/asm/termios.h        |   25 +++----
 arch/x86/include/asm/types.h          |    3 +-
 arch/x86/include/asm/unistd.h         |   15 ++---
 7 files changed, 104 insertions(+), 241 deletions(-)
 delete mode 100644 arch/x86/include/asm/posix_types_32.h
 delete mode 100644 arch/x86/include/asm/posix_types_64.h

Complete diff:

arch/x86/include/asm/Kbuild +0 -2
index 4a8e80c..786bb67 100644
@@ -16,8 +16,6 @@ unifdef-y += ist.h
 unifdef-y += mce.h
 unifdef-y += msr.h
 unifdef-y += mtrr.h
-unifdef-y += posix_types_32.h
-unifdef-y += posix_types_64.h
 unifdef-y += unistd_32.h
 unifdef-y += unistd_64.h
 unifdef-y += vm86.h
arch/x86/include/asm/posix_types.h +85 -11

98 lines not on this page · raw message

arch/x86/include/asm/posix_types_32.h deleted +0 -85

85 lines not on this page · raw message

arch/x86/include/asm/posix_types_64.h deleted +0 -119

119 lines not on this page · raw message

arch/x86/include/asm/termios.h +12 -13
index c4ee805..ee6f0c8 100644
@@ -5,20 +5,20 @@
 #include <asm/ioctls.h>
 
 struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
+	unsigned short	ws_row;
+	unsigned short	ws_col;
+	unsigned short	ws_xpixel;
+	unsigned short	ws_ypixel;
 };
 
 #define NCC 8
 struct termio {
-	unsigned short c_iflag;		/* input mode flags */
-	unsigned short c_oflag;		/* output mode flags */
-	unsigned short c_cflag;		/* control mode flags */
-	unsigned short c_lflag;		/* local mode flags */
-	unsigned char c_line;		/* line discipline */
-	unsigned char c_cc[NCC];	/* control characters */
+	unsigned short	c_iflag;	/* input mode flags	*/
+	unsigned short	c_oflag;	/* output mode flags	*/
+	unsigned short	c_cflag;	/* control mode flags	*/
+	unsigned short	c_lflag;	/* local mode flags	*/
+	unsigned char	c_line;		/* line discipline	*/
+	unsigned char	c_cc[NCC];	/* control characters	*/
 };
 
 /* modem lines */
@@ -37,10 +37,10 @@ struct termio {
 #define TIOCM_OUT2	0x4000
 #define TIOCM_LOOP	0x8000
 
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
 #ifdef __KERNEL__
 
+/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
+
 #include <asm/uaccess.h>
 
 /*	intr=^C		quit=^\		erase=del	kill=^U
@@ -110,5 +110,4 @@ static inline int kernel_termios_to_user_termios_1(struct termios __user *u,
 }
 
 #endif	/* __KERNEL__ */
-
 #endif /* _ASM_X86_TERMIOS_H */
arch/x86/include/asm/types.h +1 -2
index 09b9774..bebc9f3 100644
@@ -9,10 +9,10 @@ typedef unsigned short umode_t;
 
 #endif /* __ASSEMBLY__ */
 
+#ifdef __KERNEL__
 /*
  * These aren't exported outside the kernel to avoid name space clashes
  */
-#ifdef __KERNEL__
 
 #ifndef __ASSEMBLY__
 
@@ -26,5 +26,4 @@ typedef u32 dma_addr_t;
 
 #endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
-
 #endif /* _ASM_X86_TYPES_H */
arch/x86/include/asm/unistd.h +6 -9
index 2a58ed3..0de8cb3 100644
@@ -1,13 +1,10 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
+#ifndef _ASM_X86_UNISTD_H
+#define _ASM_X86_UNISTD_H
+
+# if defined(CONFIG_X86_32) || defined(__i386__)
 #  include "unistd_32.h"
 # else
 #  include "unistd_64.h"
 # endif
-#else
-# ifdef __i386__
-#  include "unistd_32.h"
-# else
-#  include "unistd_64.h"
-# endif
-#endif
+
+#endif /* _ASM_X86_UNISTD_H */
#10 lore raw

PATCH v2 1/4 x86: unification of posix_types.h

Use <asm-generic/posix_types.h> for default types and only override the ones that are different.

---
 arch/x86/include/asm/Kbuild           |    2 -
 arch/x86/include/asm/posix_types.h    |   96 +++++++++++++++++++++++---
 arch/x86/include/asm/posix_types_32.h |   85 -----------------------
 arch/x86/include/asm/posix_types_64.h |  119 ---------------------------------
 4 files changed, 85 insertions(+), 217 deletions(-)
 delete mode 100644 arch/x86/include/asm/posix_types_32.h
 delete mode 100644 arch/x86/include/asm/posix_types_64.h
arch/x86/include/asm/Kbuild +0 -2
index 4a8e80c..786bb67 100644
@@ -16,8 +16,6 @@ unifdef-y += ist.h
 unifdef-y += mce.h
 unifdef-y += msr.h
 unifdef-y += mtrr.h
-unifdef-y += posix_types_32.h
-unifdef-y += posix_types_64.h
 unifdef-y += unistd_32.h
 unifdef-y += unistd_64.h
 unifdef-y += vm86.h
arch/x86/include/asm/posix_types.h +85 -11

98 lines not on this page · raw message

arch/x86/include/asm/posix_types_32.h deleted +0 -85

85 lines not on this page · raw message

arch/x86/include/asm/posix_types_64.h deleted +0 -119

119 lines not on this page · raw message

Signature · 1 line
1.6.0.6
#11 lore raw

PATCH v2 2/4 x86: asm/unistd.h common for kernel and user space

Make asm/unistd.h common for kernel and user space.

Also defined _ASM_X86_UNISTD_H

---
 arch/x86/include/asm/unistd.h |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)
arch/x86/include/asm/unistd.h +6 -9
index 2a58ed3..0de8cb3 100644
@@ -1,13 +1,10 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
+#ifndef _ASM_X86_UNISTD_H
+#define _ASM_X86_UNISTD_H
+
+# if defined(CONFIG_X86_32) || defined(__i386__)
 #  include "unistd_32.h"
 # else
 #  include "unistd_64.h"
 # endif
-#else
-# ifdef __i386__
-#  include "unistd_32.h"
-# else
-#  include "unistd_64.h"
-# endif
-#endif
+
+#endif /* _ASM_X86_UNISTD_H */
Signature · 1 line
1.6.0.6
#12 lore raw

PATCH v2 3/4 x86: asm/termios.h remove irrelevant comment for userspace

following comment is irrelevant at usr/include/asm/termios.h :

"ioctl (fd, TIOCSERGETLSR, &result) where result may be as below"

Also fixed some alignment and space issues.

---
 arch/x86/include/asm/termios.h |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)
arch/x86/include/asm/termios.h +12 -13
index c4ee805..ee6f0c8 100644
@@ -5,20 +5,20 @@
 #include <asm/ioctls.h>
 
 struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
+	unsigned short	ws_row;
+	unsigned short	ws_col;
+	unsigned short	ws_xpixel;
+	unsigned short	ws_ypixel;
 };
 
 #define NCC 8
 struct termio {
-	unsigned short c_iflag;		/* input mode flags */
-	unsigned short c_oflag;		/* output mode flags */
-	unsigned short c_cflag;		/* control mode flags */
-	unsigned short c_lflag;		/* local mode flags */
-	unsigned char c_line;		/* line discipline */
-	unsigned char c_cc[NCC];	/* control characters */
+	unsigned short	c_iflag;	/* input mode flags	*/
+	unsigned short	c_oflag;	/* output mode flags	*/
+	unsigned short	c_cflag;	/* control mode flags	*/
+	unsigned short	c_lflag;	/* local mode flags	*/
+	unsigned char	c_line;		/* line discipline	*/
+	unsigned char	c_cc[NCC];	/* control characters	*/
 };
 
 /* modem lines */
@@ -37,10 +37,10 @@ struct termio {
 #define TIOCM_OUT2	0x4000
 #define TIOCM_LOOP	0x8000
 
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
 #ifdef __KERNEL__
 
+/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
+
 #include <asm/uaccess.h>
 
 /*	intr=^C		quit=^\		erase=del	kill=^U
@@ -110,5 +110,4 @@ static inline int kernel_termios_to_user_termios_1(struct termios __user *u,
 }
 
 #endif	/* __KERNEL__ */
-
 #endif /* _ASM_X86_TERMIOS_H */
Signature · 1 line
1.6.0.6
#13 lore raw

PATCH v2 4/4 x86: asm/types.h remove irrelevant comment for userspace

following comment is irrelevant at usr/include/asm/types.h :

"These aren't exported outside the kernel to avoid name space clashes"

Also fixed some spacing issues in usr/include/asm/types.h

---
 arch/x86/include/asm/types.h |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
arch/x86/include/asm/types.h +1 -2
index 09b9774..bebc9f3 100644
@@ -9,10 +9,10 @@ typedef unsigned short umode_t;
 
 #endif /* __ASSEMBLY__ */
 
+#ifdef __KERNEL__
 /*
  * These aren't exported outside the kernel to avoid name space clashes
  */
-#ifdef __KERNEL__
 
 #ifndef __ASSEMBLY__
 
@@ -26,5 +26,4 @@ typedef u32 dma_addr_t;
 
 #endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
-
 #endif /* _ASM_X86_TYPES_H */
Signature · 1 line
1.6.0.6
#14 lore raw

PATCH RESEND 1/1 x86: asm/types.h remove irrelevant comment for userspace

following comment is irrelevant at usr/include/asm/types.h :

"These aren't exported outside the kernel to avoid name space clashes"

Also fixed some spacing issues in usr/include/asm/types.h

---
 arch/x86/include/asm/types.h |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
arch/x86/include/asm/types.h +1 -2
index 09b9774..bebc9f3 100644
@@ -9,10 +9,10 @@ typedef unsigned short umode_t;
 
 #endif /* __ASSEMBLY__ */
 
+#ifdef __KERNEL__
 /*
  * These aren't exported outside the kernel to avoid name space clashes
  */
-#ifdef __KERNEL__
 
 #ifndef __ASSEMBLY__
 
@@ -26,5 +26,4 @@ typedef u32 dma_addr_t;
 
 #endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
-
 #endif /* _ASM_X86_TYPES_H */
Signature · 1 line
1.6.0.6
#15 lore raw

PATCH RESEND 1/1 x86: asm/termios.h remove irrelevant comment for userspace

In reply to Jaswinder Singh Rajput

following comment is irrelevant at usr/include/asm/termios.h :

"ioctl (fd, TIOCSERGETLSR, &result) where result may be as below"

Also fixed some alignment and space issues.

---
 arch/x86/include/asm/termios.h |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)
arch/x86/include/asm/termios.h +12 -13
index c4ee805..ee6f0c8 100644
@@ -5,20 +5,20 @@
 #include <asm/ioctls.h>
 
 struct winsize {
-	unsigned short ws_row;
-	unsigned short ws_col;
-	unsigned short ws_xpixel;
-	unsigned short ws_ypixel;
+	unsigned short	ws_row;
+	unsigned short	ws_col;
+	unsigned short	ws_xpixel;
+	unsigned short	ws_ypixel;
 };
 
 #define NCC 8
 struct termio {
-	unsigned short c_iflag;		/* input mode flags */
-	unsigned short c_oflag;		/* output mode flags */
-	unsigned short c_cflag;		/* control mode flags */
-	unsigned short c_lflag;		/* local mode flags */
-	unsigned char c_line;		/* line discipline */
-	unsigned char c_cc[NCC];	/* control characters */
+	unsigned short	c_iflag;	/* input mode flags	*/
+	unsigned short	c_oflag;	/* output mode flags	*/
+	unsigned short	c_cflag;	/* control mode flags	*/
+	unsigned short	c_lflag;	/* local mode flags	*/
+	unsigned char	c_line;		/* line discipline	*/
+	unsigned char	c_cc[NCC];	/* control characters	*/
 };
 
 /* modem lines */
@@ -37,10 +37,10 @@ struct termio {
 #define TIOCM_OUT2	0x4000
 #define TIOCM_LOOP	0x8000
 
-/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-
 #ifdef __KERNEL__
 
+/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
+
 #include <asm/uaccess.h>
 
 /*	intr=^C		quit=^\		erase=del	kill=^U
@@ -110,5 +110,4 @@ static inline int kernel_termios_to_user_termios_1(struct termios __user *u,
 }
 
 #endif	/* __KERNEL__ */
-
 #endif /* _ASM_X86_TERMIOS_H */
Signature · 1 line
1.6.0.6
#16 lore raw

Re: [PATCH -tip RESEND] x86: asm/termios.h remove irrelevant comment for userspace

Quoted 8 lines · Jaswinder Singh Rajput

following comment is irrelevant at usr/include/asm/termios.h :

"ioctl (fd, TIOCSERGETLSR, &result) where result may be as below"

Also fixed some alignment and space issues.

that file just got removed in tip.

	Arnd <><
#17 lore raw

PATCH RESEND 1/1 x86: asm/unistd.h common for kernel and user space

In reply to Jaswinder Singh Rajput

Make asm/unistd.h common for kernel and user space.

Also defined _ASM_X86_UNISTD_H

---
 arch/x86/include/asm/unistd.h |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)
arch/x86/include/asm/unistd.h +6 -9
index 2a58ed3..0de8cb3 100644
@@ -1,13 +1,10 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
+#ifndef _ASM_X86_UNISTD_H
+#define _ASM_X86_UNISTD_H
+
+# if defined(CONFIG_X86_32) || defined(__i386__)
 #  include "unistd_32.h"
 # else
 #  include "unistd_64.h"
 # endif
-#else
-# ifdef __i386__
-#  include "unistd_32.h"
-# else
-#  include "unistd_64.h"
-# endif
-#endif
+
+#endif /* _ASM_X86_UNISTD_H */
Signature · 1 line
1.6.0.6
#18 lore raw

Re: [PATCH -tip RESEND] x86: asm/unistd.h common for kernel and user space

Quoted 23 lines · Jaswinder Singh Rajput

Make asm/unistd.h common for kernel and user space.

Also defined _ASM_X86_UNISTD_H

---
 arch/x86/include/asm/unistd.h |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)
arch/x86/include/asm/unistd.h +4 -2
index 2a58ed3..0de8cb3 100644
@@ -1,13 +1,10 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
+#ifndef _ASM_X86_UNISTD_H
+#define _ASM_X86_UNISTD_H
+
+# if defined(CONFIG_X86_32) || defined(__i386__)
 #  include "unistd_32.h"
 # else
 #  include "unistd_64.h"

arch/x86/include/asm/unistd.h line 10

Quoted 10 lines
arch/x86/include/asm/unistd.h +2 -7
 # endif
-#else
-# ifdef __i386__
-#  include "unistd_32.h"
-# else
-#  include "unistd_64.h"
-# endif
-#endif
+
+#endif /* _ASM_X86_UNISTD_H */

Can we use this :

[PATCH -tip] x86: asm/unistd.h common for kernel and user space

Make asm/unistd.h common for kernel and user space.

Also defined _ASM_X86_UNISTD_H

---
 arch/x86/include/asm/unistd.h |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)
arch/x86/include/asm/unistd.h +8 -11
index 2a58ed3..3e8182e 100644
@@ -1,13 +1,10 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "unistd_32.h"
-# else
-#  include "unistd_64.h"
-# endif
+#ifndef _ASM_X86_UNISTD_H
+#define _ASM_X86_UNISTD_H
+
+#ifdef __x86_64__
+# include "unistd_64.h"
 #else
-# ifdef __i386__
-#  include "unistd_32.h"
-# else
-#  include "unistd_64.h"
-# endif
+# include "unistd_32.h"
 #endif
+
+#endif /* _ASM_X86_UNISTD_H */
Signature · 1 line
1.6.0.6
#19 lore raw

PATCH RESEND 1/1 x86: unification of posix_types.h

In reply to Jaswinder Singh Rajput

Use <asm-generic/posix_types.h> for default types and only override the ones that are different.

---
 arch/x86/include/asm/Kbuild           |    2 -
 arch/x86/include/asm/posix_types.h    |   96 +++++++++++++++++++++++---
 arch/x86/include/asm/posix_types_32.h |   85 -----------------------
 arch/x86/include/asm/posix_types_64.h |  119 ---------------------------------
 4 files changed, 85 insertions(+), 217 deletions(-)
 delete mode 100644 arch/x86/include/asm/posix_types_32.h
 delete mode 100644 arch/x86/include/asm/posix_types_64.h
arch/x86/include/asm/Kbuild +0 -2
index 4a8e80c..786bb67 100644
@@ -16,8 +16,6 @@ unifdef-y += ist.h
 unifdef-y += mce.h
 unifdef-y += msr.h
 unifdef-y += mtrr.h
-unifdef-y += posix_types_32.h
-unifdef-y += posix_types_64.h
 unifdef-y += unistd_32.h
 unifdef-y += unistd_64.h
 unifdef-y += vm86.h
arch/x86/include/asm/posix_types.h +85 -11

98 lines not on this page · raw message

arch/x86/include/asm/posix_types_32.h deleted +0 -85

85 lines not on this page · raw message

arch/x86/include/asm/posix_types_64.h deleted +0 -119

119 lines not on this page · raw message

Signature · 1 line
1.6.0.6