diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-cris/Kbuild | 4 | ||||
-rw-r--r-- | include/asm-cris/arch-v10/Kbuild | 2 | ||||
-rw-r--r-- | include/asm-cris/arch-v32/Kbuild | 2 | ||||
-rw-r--r-- | include/asm-cris/byteorder.h | 3 | ||||
-rw-r--r-- | include/asm-cris/elf.h | 8 | ||||
-rw-r--r-- | include/asm-cris/page.h | 8 | ||||
-rw-r--r-- | include/asm-cris/posix_types.h | 9 | ||||
-rw-r--r-- | include/asm-cris/unistd.h | 4 |
8 files changed, 23 insertions, 17 deletions
diff --git a/include/asm-cris/Kbuild b/include/asm-cris/Kbuild index c68e1680da01..14498d5a2f65 100644 --- a/include/asm-cris/Kbuild +++ b/include/asm-cris/Kbuild | |||
@@ -1 +1,5 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | |||
3 | header-y += arch-v10/ arch-v32/ | ||
4 | |||
5 | unifdef-y += rs485.h | ||
diff --git a/include/asm-cris/arch-v10/Kbuild b/include/asm-cris/arch-v10/Kbuild new file mode 100644 index 000000000000..d7f27dc0941a --- /dev/null +++ b/include/asm-cris/arch-v10/Kbuild | |||
@@ -0,0 +1,2 @@ | |||
1 | header-y += ptrace.h | ||
2 | header-y += user.h | ||
diff --git a/include/asm-cris/arch-v32/Kbuild b/include/asm-cris/arch-v32/Kbuild new file mode 100644 index 000000000000..d7f27dc0941a --- /dev/null +++ b/include/asm-cris/arch-v32/Kbuild | |||
@@ -0,0 +1,2 @@ | |||
1 | header-y += ptrace.h | ||
2 | header-y += user.h | ||
diff --git a/include/asm-cris/byteorder.h b/include/asm-cris/byteorder.h index a1a222adaa9f..0cd9db1cc888 100644 --- a/include/asm-cris/byteorder.h +++ b/include/asm-cris/byteorder.h | |||
@@ -3,14 +3,15 @@ | |||
3 | 3 | ||
4 | #ifdef __GNUC__ | 4 | #ifdef __GNUC__ |
5 | 5 | ||
6 | #ifdef __KERNEL__ | ||
6 | #include <asm/arch/byteorder.h> | 7 | #include <asm/arch/byteorder.h> |
7 | 8 | ||
8 | /* defines are necessary because the other files detect the presence | 9 | /* defines are necessary because the other files detect the presence |
9 | * of a defined __arch_swab32, not an inline | 10 | * of a defined __arch_swab32, not an inline |
10 | */ | 11 | */ |
11 | |||
12 | #define __arch__swab32(x) ___arch__swab32(x) | 12 | #define __arch__swab32(x) ___arch__swab32(x) |
13 | #define __arch__swab16(x) ___arch__swab16(x) | 13 | #define __arch__swab16(x) ___arch__swab16(x) |
14 | #endif /* __KERNEL__ */ | ||
14 | 15 | ||
15 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) | 16 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) |
16 | # define __BYTEORDER_HAS_U64__ | 17 | # define __BYTEORDER_HAS_U64__ |
diff --git a/include/asm-cris/elf.h b/include/asm-cris/elf.h index 87a60bd8e667..96a40c1de57c 100644 --- a/include/asm-cris/elf.h +++ b/include/asm-cris/elf.h | |||
@@ -5,7 +5,6 @@ | |||
5 | * ELF register definitions.. | 5 | * ELF register definitions.. |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <asm/arch/elf.h> | ||
9 | #include <asm/user.h> | 8 | #include <asm/user.h> |
10 | 9 | ||
11 | #define R_CRIS_NONE 0 | 10 | #define R_CRIS_NONE 0 |
@@ -46,6 +45,9 @@ typedef unsigned long elf_fpregset_t; | |||
46 | #define ELF_DATA ELFDATA2LSB | 45 | #define ELF_DATA ELFDATA2LSB |
47 | #define ELF_ARCH EM_CRIS | 46 | #define ELF_ARCH EM_CRIS |
48 | 47 | ||
48 | #ifdef __KERNEL__ | ||
49 | #include <asm/arch/elf.h> | ||
50 | |||
49 | /* The master for these definitions is {binutils}/include/elf/cris.h: */ | 51 | /* The master for these definitions is {binutils}/include/elf/cris.h: */ |
50 | /* User symbols in this file have a leading underscore. */ | 52 | /* User symbols in this file have a leading underscore. */ |
51 | #define EF_CRIS_UNDERSCORE 0x00000001 | 53 | #define EF_CRIS_UNDERSCORE 0x00000001 |
@@ -87,8 +89,8 @@ typedef unsigned long elf_fpregset_t; | |||
87 | 89 | ||
88 | #define ELF_PLATFORM (NULL) | 90 | #define ELF_PLATFORM (NULL) |
89 | 91 | ||
90 | #ifdef __KERNEL__ | ||
91 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) | 92 | #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) |
92 | #endif | 93 | |
94 | #endif /* __KERNEL__ */ | ||
93 | 95 | ||
94 | #endif | 96 | #endif |
diff --git a/include/asm-cris/page.h b/include/asm-cris/page.h index 81832e9e157f..9f13c32552bf 100644 --- a/include/asm-cris/page.h +++ b/include/asm-cris/page.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _CRIS_PAGE_H | 1 | #ifndef _CRIS_PAGE_H |
2 | #define _CRIS_PAGE_H | 2 | #define _CRIS_PAGE_H |
3 | 3 | ||
4 | #ifdef __KERNEL__ | ||
5 | |||
4 | #include <asm/arch/page.h> | 6 | #include <asm/arch/page.h> |
5 | 7 | ||
6 | /* PAGE_SHIFT determines the page size */ | 8 | /* PAGE_SHIFT determines the page size */ |
@@ -12,8 +14,6 @@ | |||
12 | #endif | 14 | #endif |
13 | #define PAGE_MASK (~(PAGE_SIZE-1)) | 15 | #define PAGE_MASK (~(PAGE_SIZE-1)) |
14 | 16 | ||
15 | #ifdef __KERNEL__ | ||
16 | |||
17 | #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) | 17 | #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) |
18 | #define copy_page(to,from) memcpy((void *)(to), (void *)(from), PAGE_SIZE) | 18 | #define copy_page(to,from) memcpy((void *)(to), (void *)(from), PAGE_SIZE) |
19 | 19 | ||
@@ -73,10 +73,10 @@ typedef struct { unsigned long pgprot; } pgprot_t; | |||
73 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ | 73 | #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ |
74 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | 74 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
75 | 75 | ||
76 | #endif /* __KERNEL__ */ | ||
77 | |||
78 | #include <asm-generic/memory_model.h> | 76 | #include <asm-generic/memory_model.h> |
79 | #include <asm-generic/page.h> | 77 | #include <asm-generic/page.h> |
80 | 78 | ||
79 | #endif /* __KERNEL__ */ | ||
80 | |||
81 | #endif /* _CRIS_PAGE_H */ | 81 | #endif /* _CRIS_PAGE_H */ |
82 | 82 | ||
diff --git a/include/asm-cris/posix_types.h b/include/asm-cris/posix_types.h index 6d26fee4a614..7b9ed22ab5dd 100644 --- a/include/asm-cris/posix_types.h +++ b/include/asm-cris/posix_types.h | |||
@@ -6,8 +6,6 @@ | |||
6 | #ifndef __ARCH_CRIS_POSIX_TYPES_H | 6 | #ifndef __ARCH_CRIS_POSIX_TYPES_H |
7 | #define __ARCH_CRIS_POSIX_TYPES_H | 7 | #define __ARCH_CRIS_POSIX_TYPES_H |
8 | 8 | ||
9 | #include <asm/bitops.h> | ||
10 | |||
11 | /* | 9 | /* |
12 | * This file is generally used by user-level software, so you need to | 10 | * This file is generally used by user-level software, so you need to |
13 | * be a little careful about namespace pollution etc. Also, we cannot | 11 | * be a little careful about namespace pollution etc. Also, we cannot |
@@ -53,9 +51,8 @@ typedef struct { | |||
53 | #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ | 51 | #endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ |
54 | } __kernel_fsid_t; | 52 | } __kernel_fsid_t; |
55 | 53 | ||
56 | /* should this ifdef be here ? */ | 54 | #ifdef __KERNEL__ |
57 | 55 | #include <asm/bitops.h> | |
58 | #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) | ||
59 | 56 | ||
60 | #undef __FD_SET | 57 | #undef __FD_SET |
61 | #define __FD_SET(fd,fdsetp) set_bit(fd, (void *)(fdsetp)) | 58 | #define __FD_SET(fd,fdsetp) set_bit(fd, (void *)(fdsetp)) |
@@ -69,6 +66,6 @@ typedef struct { | |||
69 | #undef __FD_ZERO | 66 | #undef __FD_ZERO |
70 | #define __FD_ZERO(fdsetp) memset((void *)(fdsetp), 0, __FDSET_LONGS << 2) | 67 | #define __FD_ZERO(fdsetp) memset((void *)(fdsetp), 0, __FDSET_LONGS << 2) |
71 | 68 | ||
72 | #endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ | 69 | #endif /* __KERNEL__ */ |
73 | 70 | ||
74 | #endif /* __ARCH_CRIS_POSIX_TYPES_H */ | 71 | #endif /* __ARCH_CRIS_POSIX_TYPES_H */ |
diff --git a/include/asm-cris/unistd.h b/include/asm-cris/unistd.h index c2954e90aa24..7372efae0516 100644 --- a/include/asm-cris/unistd.h +++ b/include/asm-cris/unistd.h | |||
@@ -1,8 +1,6 @@ | |||
1 | #ifndef _ASM_CRIS_UNISTD_H_ | 1 | #ifndef _ASM_CRIS_UNISTD_H_ |
2 | #define _ASM_CRIS_UNISTD_H_ | 2 | #define _ASM_CRIS_UNISTD_H_ |
3 | 3 | ||
4 | #include <asm/arch/unistd.h> | ||
5 | |||
6 | /* | 4 | /* |
7 | * This file contains the system call numbers, and stub macros for libc. | 5 | * This file contains the system call numbers, and stub macros for libc. |
8 | */ | 6 | */ |
@@ -299,6 +297,7 @@ | |||
299 | 297 | ||
300 | #define NR_syscalls 289 | 298 | #define NR_syscalls 289 |
301 | 299 | ||
300 | #include <asm/arch/unistd.h> | ||
302 | 301 | ||
303 | #define __ARCH_WANT_IPC_PARSE_VERSION | 302 | #define __ARCH_WANT_IPC_PARSE_VERSION |
304 | #define __ARCH_WANT_OLD_READDIR | 303 | #define __ARCH_WANT_OLD_READDIR |
@@ -322,7 +321,6 @@ | |||
322 | #define __ARCH_WANT_SYS_SIGPENDING | 321 | #define __ARCH_WANT_SYS_SIGPENDING |
323 | #define __ARCH_WANT_SYS_SIGPROCMASK | 322 | #define __ARCH_WANT_SYS_SIGPROCMASK |
324 | #define __ARCH_WANT_SYS_RT_SIGACTION | 323 | #define __ARCH_WANT_SYS_RT_SIGACTION |
325 | #endif | ||
326 | 324 | ||
327 | #ifdef __KERNEL_SYSCALLS__ | 325 | #ifdef __KERNEL_SYSCALLS__ |
328 | 326 | ||