diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-26 23:16:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-26 23:16:38 -0400 |
| commit | 533995ed85730a1f5f385b9ecb2d2b4b731d27b4 (patch) | |
| tree | 1dcccfbece1d9275f1c595c460492afdf7551a17 /arch/m68knommu/kernel/syscalltable.S | |
| parent | cc674c81f01a6151ca00c617e5efa0812ee5fdbe (diff) | |
| parent | 9848484fad9ddeb18f18f02f9ecdcd330ac9a216 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k,m68knommu: Wire up rt_tgsigqueueinfo and perf_counter_open
m68k: Fix redefinition of pgprot_noncached
arch/m68k/include/asm/motorola_pgalloc.h: fix kunmap arg
m68k: cnt reaches -1, not 0
m68k: count can reach 51, not 50
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) | |||
| 349 | .long sys_inotify_init1 | 349 | .long sys_inotify_init1 |
| 350 | .long sys_preadv | 350 | .long sys_preadv |
| 351 | .long sys_pwritev /* 330 */ | 351 | .long sys_pwritev /* 330 */ |
| 352 | .long sys_rt_tgsigqueueinfo | ||
| 353 | .long sys_perf_counter_open | ||
| 352 | 354 | ||
| 353 | .rept NR_syscalls-(.-sys_call_table)/4 | 355 | .rept NR_syscalls-(.-sys_call_table)/4 |
| 354 | .long sys_ni_syscall | 356 | .long sys_ni_syscall |