diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-14 22:58:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-14 22:58:40 -0500 |
| commit | bca268565fd18f0b36ab8fff6e1623d8dffae2b1 (patch) | |
| tree | 11abda03d7a7764cfa6a49a6ec2da1576b3058ee /arch/arm | |
| parent | 74d96f018673759d04d032c137d132f6447bfb1e (diff) | |
| parent | 26689452f5ca201add63b1b1ff0dbcf82d6885e7 (diff) | |
Merge branch 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (44 commits)
[CVE-2009-0029] s390 specific system call wrappers
[CVE-2009-0029] System call wrappers part 33
[CVE-2009-0029] System call wrappers part 32
[CVE-2009-0029] System call wrappers part 31
[CVE-2009-0029] System call wrappers part 30
[CVE-2009-0029] System call wrappers part 29
[CVE-2009-0029] System call wrappers part 28
[CVE-2009-0029] System call wrappers part 27
[CVE-2009-0029] System call wrappers part 26
[CVE-2009-0029] System call wrappers part 25
[CVE-2009-0029] System call wrappers part 24
[CVE-2009-0029] System call wrappers part 23
[CVE-2009-0029] System call wrappers part 22
[CVE-2009-0029] System call wrappers part 21
[CVE-2009-0029] System call wrappers part 20
[CVE-2009-0029] System call wrappers part 19
[CVE-2009-0029] System call wrappers part 18
[CVE-2009-0029] System call wrappers part 17
[CVE-2009-0029] System call wrappers part 16
[CVE-2009-0029] System call wrappers part 15
...
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/calls.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 09a061cb7838..9ca8d13f05f7 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S | |||
| @@ -98,7 +98,7 @@ | |||
| 98 | CALL(sys_uselib) | 98 | CALL(sys_uselib) |
| 99 | CALL(sys_swapon) | 99 | CALL(sys_swapon) |
| 100 | CALL(sys_reboot) | 100 | CALL(sys_reboot) |
| 101 | CALL(OBSOLETE(old_readdir)) /* used by libc4 */ | 101 | CALL(OBSOLETE(sys_old_readdir)) /* used by libc4 */ |
| 102 | /* 90 */ CALL(OBSOLETE(old_mmap)) /* used by libc4 */ | 102 | /* 90 */ CALL(OBSOLETE(old_mmap)) /* used by libc4 */ |
| 103 | CALL(sys_munmap) | 103 | CALL(sys_munmap) |
| 104 | CALL(sys_truncate) | 104 | CALL(sys_truncate) |