diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-26 20:16:38 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-26 20:16:38 -0700 |
commit | 533995ed85730a1f5f385b9ecb2d2b4b731d27b4 (patch) | |
tree | 1dcccfbece1d9275f1c595c460492afdf7551a17 /arch/m68k/include/asm/unistd.h | |
parent | cc674c81f01a6151ca00c617e5efa0812ee5fdbe (diff) | |
parent | 9848484fad9ddeb18f18f02f9ecdcd330ac9a216 (diff) | |
download | kernel_samsung_smdk4412-533995ed85730a1f5f385b9ecb2d2b4b731d27b4.zip kernel_samsung_smdk4412-533995ed85730a1f5f385b9ecb2d2b4b731d27b4.tar.gz kernel_samsung_smdk4412-533995ed85730a1f5f385b9ecb2d2b4b731d27b4.tar.bz2 |
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/m68k/include/asm/unistd.h')
-rw-r--r-- | arch/m68k/include/asm/unistd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h index aa29a86..946d869 100644 --- a/arch/m68k/include/asm/unistd.h +++ b/arch/m68k/include/asm/unistd.h @@ -334,10 +334,12 @@ #define __NR_inotify_init1 328 #define __NR_preadv 329 #define __NR_pwritev 330 +#define __NR_rt_tgsigqueueinfo 331 +#define __NR_perf_counter_open 332 #ifdef __KERNEL__ -#define NR_syscalls 331 +#define NR_syscalls 333 #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR |