diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 07:00:20 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 07:00:20 +0200 |
commit | 4b61bb575b1fb42ab1df228ae7812e5135f656da (patch) | |
tree | 03456466e6f678456ea462a7da4b352d1aa03aa3 /arch/m68knommu/kernel/syscalltable.S | |
parent | Input: xpad - add USB ID for the drumkit controller from Rock Band (diff) | |
parent | Linux 2.6.31-rc8 (diff) | |
download | linux-4b61bb575b1fb42ab1df228ae7812e5135f656da.tar.xz linux-4b61bb575b1fb42ab1df228ae7812e5135f656da.zip |
Merge commit 'v2.6.31-rc8' into next
Diffstat (limited to 'arch/m68knommu/kernel/syscalltable.S')
-rw-r--r-- | arch/m68knommu/kernel/syscalltable.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68knommu/kernel/syscalltable.S b/arch/m68knommu/kernel/syscalltable.S index c0b8782832fd..0ae123e08985 100644 --- a/arch/m68knommu/kernel/syscalltable.S +++ b/arch/m68knommu/kernel/syscalltable.S @@ -349,6 +349,8 @@ ENTRY(sys_call_table) .long sys_inotify_init1 .long sys_preadv .long sys_pwritev /* 330 */ + .long sys_rt_tgsigqueueinfo + .long sys_perf_counter_open .rept NR_syscalls-(.-sys_call_table)/4 .long sys_ni_syscall |