diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-26 17:04:15 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:55:17 -0500 |
commit | 0583fcc96bb117763c0fa74c123573c0112dec65 (patch) | |
tree | 5d8a62e922c34e6e6bc0836b40f5b59f69266766 /arch/sparc | |
parent | 1bc94226d5c642b78cf6b2e3e843ef24eb740df0 (diff) |
consolidate umode_t declarations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/include/asm/posix_types.h | 2 | ||||
-rw-r--r-- | arch/sparc/include/asm/types.h | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/sparc/include/asm/posix_types.h b/arch/sparc/include/asm/posix_types.h index 98d6ebb922fb..dbfc1a34b3a2 100644 --- a/arch/sparc/include/asm/posix_types.h +++ b/arch/sparc/include/asm/posix_types.h | |||
@@ -20,7 +20,6 @@ typedef unsigned int __kernel_uid_t; | |||
20 | typedef unsigned int __kernel_gid_t; | 20 | typedef unsigned int __kernel_gid_t; |
21 | typedef unsigned long __kernel_ino_t; | 21 | typedef unsigned long __kernel_ino_t; |
22 | typedef unsigned int __kernel_mode_t; | 22 | typedef unsigned int __kernel_mode_t; |
23 | typedef unsigned short __kernel_umode_t; | ||
24 | typedef unsigned int __kernel_nlink_t; | 23 | typedef unsigned int __kernel_nlink_t; |
25 | typedef int __kernel_daddr_t; | 24 | typedef int __kernel_daddr_t; |
26 | typedef long __kernel_off_t; | 25 | typedef long __kernel_off_t; |
@@ -55,7 +54,6 @@ typedef unsigned short __kernel_uid_t; | |||
55 | typedef unsigned short __kernel_gid_t; | 54 | typedef unsigned short __kernel_gid_t; |
56 | typedef unsigned long __kernel_ino_t; | 55 | typedef unsigned long __kernel_ino_t; |
57 | typedef unsigned short __kernel_mode_t; | 56 | typedef unsigned short __kernel_mode_t; |
58 | typedef unsigned short __kernel_umode_t; | ||
59 | typedef short __kernel_nlink_t; | 57 | typedef short __kernel_nlink_t; |
60 | typedef long __kernel_daddr_t; | 58 | typedef long __kernel_daddr_t; |
61 | typedef long __kernel_off_t; | 59 | typedef long __kernel_off_t; |
diff --git a/arch/sparc/include/asm/types.h b/arch/sparc/include/asm/types.h index 91e5a034f987..383d156cde9c 100644 --- a/arch/sparc/include/asm/types.h +++ b/arch/sparc/include/asm/types.h | |||
@@ -12,12 +12,6 @@ | |||
12 | 12 | ||
13 | #include <asm-generic/int-ll64.h> | 13 | #include <asm-generic/int-ll64.h> |
14 | 14 | ||
15 | #ifndef __ASSEMBLY__ | ||
16 | |||
17 | typedef unsigned short umode_t; | ||
18 | |||
19 | #endif /* __ASSEMBLY__ */ | ||
20 | |||
21 | #endif /* defined(__sparc__) */ | 15 | #endif /* defined(__sparc__) */ |
22 | 16 | ||
23 | #endif /* defined(_SPARC_TYPES_H) */ | 17 | #endif /* defined(_SPARC_TYPES_H) */ |