diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 11:51:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 11:51:11 -0400 |
| commit | c8e16aa291c7d1ff14d3784e52bd376bcae17d54 (patch) | |
| tree | 3a4e725ef430b6c71af96c7c855b63732f453c81 /include | |
| parent | 6936b17ea03f54525f01b12819d558ba52a86b46 (diff) | |
| parent | fad9e7d95769ff6c0918b79d58a7ba03615c3ff9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
sh64: Flag sh64_get_page() as __init_refok.
sh64: Move entry point code to .text.head.
sh64: Fix up PCI section mismatch warnings.
sh64: Update cayman defconfig.
sh64: Wire up fallocate() syscall.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sh64/unistd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-sh64/unistd.h b/include/asm-sh64/unistd.h index ea3adc600b41..1a5197f369b2 100644 --- a/include/asm-sh64/unistd.h +++ b/include/asm-sh64/unistd.h | |||
| @@ -374,10 +374,11 @@ | |||
| 374 | #define __NR_signalfd 349 | 374 | #define __NR_signalfd 349 |
| 375 | #define __NR_timerfd 350 | 375 | #define __NR_timerfd 350 |
| 376 | #define __NR_eventfd 351 | 376 | #define __NR_eventfd 351 |
| 377 | #define __NR_fallocate 352 | ||
| 377 | 378 | ||
| 378 | #ifdef __KERNEL__ | 379 | #ifdef __KERNEL__ |
| 379 | 380 | ||
| 380 | #define NR_syscalls 352 | 381 | #define NR_syscalls 353 |
| 381 | 382 | ||
| 382 | #define __ARCH_WANT_IPC_PARSE_VERSION | 383 | #define __ARCH_WANT_IPC_PARSE_VERSION |
| 383 | #define __ARCH_WANT_OLD_READDIR | 384 | #define __ARCH_WANT_OLD_READDIR |