diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
| commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
| tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /include/asm-arm | |
| parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) | |
Merge with Linux 2.3.38.
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/processor.h | 1 | ||||
| -rw-r--r-- | include/asm-arm/stat.h | 1 | ||||
| -rw-r--r-- | include/asm-arm/unistd.h | 9 |
3 files changed, 9 insertions, 2 deletions
diff --git a/include/asm-arm/processor.h b/include/asm-arm/processor.h index ce080d4ad..462c9a8c0 100644 --- a/include/asm-arm/processor.h +++ b/include/asm-arm/processor.h @@ -117,7 +117,6 @@ unsigned long get_wchan(struct task_struct *p); extern struct task_struct *alloc_task_struct(void); extern void __free_task_struct(struct task_struct *); #define get_task_struct(p) atomic_inc(&(p)->thread.refcount) -#define put_task_struct(p) free_task_struct(p) #define free_task_struct(p) \ do { \ if (atomic_dec_and_test(&(p)->thread.refcount)) \ diff --git a/include/asm-arm/stat.h b/include/asm-arm/stat.h index 76c20e28f..970e0eb62 100644 --- a/include/asm-arm/stat.h +++ b/include/asm-arm/stat.h @@ -38,4 +38,5 @@ struct stat { unsigned long __unused5; }; +/* Someone please add a glibc/arm compatible stat64 struct here. */ #endif diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h index 397d80ed5..7bfbf2349 100644 --- a/include/asm-arm/unistd.h +++ b/include/asm-arm/unistd.h @@ -83,7 +83,7 @@ #define __NR_sigpending (__NR_SYSCALL_BASE+ 73) #define __NR_sethostname (__NR_SYSCALL_BASE+ 74) #define __NR_setrlimit (__NR_SYSCALL_BASE+ 75) -#define __NR_getrlimit (__NR_SYSCALL_BASE+ 76) +#define __NR_old_getrlimit (__NR_SYSCALL_BASE+ 76) #define __NR_getrusage (__NR_SYSCALL_BASE+ 77) #define __NR_gettimeofday (__NR_SYSCALL_BASE+ 78) #define __NR_settimeofday (__NR_SYSCALL_BASE+ 79) @@ -198,6 +198,13 @@ /* 188 reserved */ /* 189 reserved */ #define __NR_vfork (__NR_SYSCALL_BASE+190) +#define __NR_getrlimit (__NR_SYSCALL_BASE+191) +#define __NR_mmap2 (__NR_SYSCALL_BASE+192) +#define __NR_truncate64 (__NR_SYSCALL_BASE+193) +#define __NR_ftruncate64 (__NR_SYSCALL_BASE+194) +#define __NR_stat64 (__NR_SYSCALL_BASE+195) +#define __NR_lstat64 (__NR_SYSCALL_BASE+196) +#define __NR_fstat64 (__NR_SYSCALL_BASE+197) #define __sys2(x) #x #define __sys1(x) __sys2(x) |