summaryrefslogtreecommitdiffstats
path: root/arch/m68knommu
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-14 19:58:40 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-14 19:58:40 -0800
commitbca268565fd18f0b36ab8fff6e1623d8dffae2b1 (patch)
tree11abda03d7a7764cfa6a49a6ec2da1576b3058ee /arch/m68knommu
parent74d96f018673759d04d032c137d132f6447bfb1e (diff)
parent26689452f5ca201add63b1b1ff0dbcf82d6885e7 (diff)
downloadop-kernel-dev-bca268565fd18f0b36ab8fff6e1623d8dffae2b1.zip
op-kernel-dev-bca268565fd18f0b36ab8fff6e1623d8dffae2b1.tar.gz
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/m68knommu')
-rw-r--r--arch/m68knommu/kernel/syscalltable.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S
index 812f8d8..5c3e3f6 100644
--- a/arch/m68knommu/kernel/syscalltable.S
+++ b/arch/m68knommu/kernel/syscalltable.S
@@ -107,7 +107,7 @@ ENTRY(sys_call_table)
.long sys_uselib
.long sys_ni_syscall /* sys_swapon */
.long sys_reboot
- .long old_readdir
+ .long sys_old_readdir
.long old_mmap /* 90 */
.long sys_munmap
.long sys_truncate
OpenPOWER on IntegriCloud