diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 21:12:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 21:12:23 -0400 |
commit | a591afc01d9e48affbacb365558a31e53c85af45 (patch) | |
tree | 9bb91f4eb94ec69fc4706c4944788ec5f3586063 /arch/avr32 | |
parent | 820d41cf0cd0e94a5661e093821e2e5c6b36a9d8 (diff) | |
parent | 31796ac4e8f0e88f5c10f1ad6dab8f19bebe44a4 (diff) |
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x32 support for x86-64 from Ingo Molnar:
"This tree introduces the X32 binary format and execution mode for x86:
32-bit data space binaries using 64-bit instructions and 64-bit kernel
syscalls.
This allows applications whose working set fits into a 32 bits address
space to make use of 64-bit instructions while using a 32-bit address
space with shorter pointers, more compressed data structures, etc."
Fix up trivial context conflicts in arch/x86/{Kconfig,vdso/vma.c}
* 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (71 commits)
x32: Fix alignment fail in struct compat_siginfo
x32: Fix stupid ia32/x32 inversion in the siginfo format
x32: Add ptrace for x32
x32: Switch to a 64-bit clock_t
x32: Provide separate is_ia32_task() and is_x32_task() predicates
x86, mtrr: Use explicit sizing and padding for the 64-bit ioctls
x86/x32: Fix the binutils auto-detect
x32: Warn and disable rather than error if binutils too old
x32: Only clear TIF_X32 flag once
x32: Make sure TS_COMPAT is cleared for x32 tasks
fs: Remove missed ->fds_bits from cessation use of fd_set structs internally
fs: Fix close_on_exec pointer in alloc_fdtable
x32: Drop non-__vdso weak symbols from the x32 VDSO
x32: Fix coding style violations in the x32 VDSO code
x32: Add x32 VDSO support
x32: Allow x32 to be configured
x32: If configured, add x32 system calls to system call tables
x32: Handle process creation
x32: Signal-related system calls
x86: Add #ifdef CONFIG_COMPAT to <asm/sys_ia32.h>
...
Diffstat (limited to 'arch/avr32')
-rw-r--r-- | arch/avr32/include/asm/posix_types.h | 107 |
1 files changed, 11 insertions, 96 deletions
diff --git a/arch/avr32/include/asm/posix_types.h b/arch/avr32/include/asm/posix_types.h index fe0c0c014389..74667bfc88cc 100644 --- a/arch/avr32/include/asm/posix_types.h +++ b/arch/avr32/include/asm/posix_types.h | |||
@@ -14,112 +14,27 @@ | |||
14 | * assume GCC is being used. | 14 | * assume GCC is being used. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | typedef unsigned long __kernel_ino_t; | ||
18 | typedef unsigned short __kernel_mode_t; | 17 | typedef unsigned short __kernel_mode_t; |
18 | #define __kernel_mode_t __kernel_mode_t | ||
19 | |||
19 | typedef unsigned short __kernel_nlink_t; | 20 | typedef unsigned short __kernel_nlink_t; |
20 | typedef long __kernel_off_t; | 21 | #define __kernel_nlink_t __kernel_nlink_t |
21 | typedef int __kernel_pid_t; | 22 | |
22 | typedef unsigned short __kernel_ipc_pid_t; | 23 | typedef unsigned short __kernel_ipc_pid_t; |
23 | typedef unsigned int __kernel_uid_t; | 24 | #define __kernel_ipc_pid_t __kernel_ipc_pid_t |
24 | typedef unsigned int __kernel_gid_t; | 25 | |
25 | typedef unsigned long __kernel_size_t; | 26 | typedef unsigned long __kernel_size_t; |
26 | typedef long __kernel_ssize_t; | 27 | typedef long __kernel_ssize_t; |
27 | typedef int __kernel_ptrdiff_t; | 28 | typedef int __kernel_ptrdiff_t; |
28 | typedef long __kernel_time_t; | 29 | #define __kernel_size_t __kernel_size_t |
29 | typedef long __kernel_suseconds_t; | ||
30 | typedef long __kernel_clock_t; | ||
31 | typedef int __kernel_timer_t; | ||
32 | typedef int __kernel_clockid_t; | ||
33 | typedef int __kernel_daddr_t; | ||
34 | typedef char * __kernel_caddr_t; | ||
35 | typedef unsigned short __kernel_uid16_t; | ||
36 | typedef unsigned short __kernel_gid16_t; | ||
37 | typedef unsigned int __kernel_uid32_t; | ||
38 | typedef unsigned int __kernel_gid32_t; | ||
39 | 30 | ||
40 | typedef unsigned short __kernel_old_uid_t; | 31 | typedef unsigned short __kernel_old_uid_t; |
41 | typedef unsigned short __kernel_old_gid_t; | 32 | typedef unsigned short __kernel_old_gid_t; |
42 | typedef unsigned short __kernel_old_dev_t; | 33 | #define __kernel_old_uid_t __kernel_old_uid_t |
43 | |||
44 | #ifdef __GNUC__ | ||
45 | typedef long long __kernel_loff_t; | ||
46 | #endif | ||
47 | |||
48 | typedef struct { | ||
49 | int val[2]; | ||
50 | } __kernel_fsid_t; | ||
51 | |||
52 | #if defined(__KERNEL__) | ||
53 | |||
54 | #undef __FD_SET | ||
55 | static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp) | ||
56 | { | ||
57 | unsigned long __tmp = __fd / __NFDBITS; | ||
58 | unsigned long __rem = __fd % __NFDBITS; | ||
59 | __fdsetp->fds_bits[__tmp] |= (1UL<<__rem); | ||
60 | } | ||
61 | |||
62 | #undef __FD_CLR | ||
63 | static __inline__ void __FD_CLR(unsigned long __fd, __kernel_fd_set *__fdsetp) | ||
64 | { | ||
65 | unsigned long __tmp = __fd / __NFDBITS; | ||
66 | unsigned long __rem = __fd % __NFDBITS; | ||
67 | __fdsetp->fds_bits[__tmp] &= ~(1UL<<__rem); | ||
68 | } | ||
69 | 34 | ||
35 | typedef unsigned short __kernel_old_dev_t; | ||
36 | #define __kernel_old_dev_t __kernel_old_dev_t | ||
70 | 37 | ||
71 | #undef __FD_ISSET | 38 | #include <asm-generic/posix_types.h> |
72 | static __inline__ int __FD_ISSET(unsigned long __fd, const __kernel_fd_set *__p) | ||
73 | { | ||
74 | unsigned long __tmp = __fd / __NFDBITS; | ||
75 | unsigned long __rem = __fd % __NFDBITS; | ||
76 | return (__p->fds_bits[__tmp] & (1UL<<__rem)) != 0; | ||
77 | } | ||
78 | |||
79 | /* | ||
80 | * This will unroll the loop for the normal constant case (8 ints, | ||
81 | * for a 256-bit fd_set) | ||
82 | */ | ||
83 | #undef __FD_ZERO | ||
84 | static __inline__ void __FD_ZERO(__kernel_fd_set *__p) | ||
85 | { | ||
86 | unsigned long *__tmp = __p->fds_bits; | ||
87 | int __i; | ||
88 | |||
89 | if (__builtin_constant_p(__FDSET_LONGS)) { | ||
90 | switch (__FDSET_LONGS) { | ||
91 | case 16: | ||
92 | __tmp[ 0] = 0; __tmp[ 1] = 0; | ||
93 | __tmp[ 2] = 0; __tmp[ 3] = 0; | ||
94 | __tmp[ 4] = 0; __tmp[ 5] = 0; | ||
95 | __tmp[ 6] = 0; __tmp[ 7] = 0; | ||
96 | __tmp[ 8] = 0; __tmp[ 9] = 0; | ||
97 | __tmp[10] = 0; __tmp[11] = 0; | ||
98 | __tmp[12] = 0; __tmp[13] = 0; | ||
99 | __tmp[14] = 0; __tmp[15] = 0; | ||
100 | return; | ||
101 | |||
102 | case 8: | ||
103 | __tmp[ 0] = 0; __tmp[ 1] = 0; | ||
104 | __tmp[ 2] = 0; __tmp[ 3] = 0; | ||
105 | __tmp[ 4] = 0; __tmp[ 5] = 0; | ||
106 | __tmp[ 6] = 0; __tmp[ 7] = 0; | ||
107 | return; | ||
108 | |||
109 | case 4: | ||
110 | __tmp[ 0] = 0; __tmp[ 1] = 0; | ||
111 | __tmp[ 2] = 0; __tmp[ 3] = 0; | ||
112 | return; | ||
113 | } | ||
114 | } | ||
115 | __i = __FDSET_LONGS; | ||
116 | while (__i) { | ||
117 | __i--; | ||
118 | *__tmp = 0; | ||
119 | __tmp++; | ||
120 | } | ||
121 | } | ||
122 | |||
123 | #endif /* defined(__KERNEL__) */ | ||
124 | 39 | ||
125 | #endif /* __ASM_AVR32_POSIX_TYPES_H */ | 40 | #endif /* __ASM_AVR32_POSIX_TYPES_H */ |