summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-20 19:51:11 +0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-20 19:51:11 +0400
commitc8e16aa291c7d1ff14d3784e52bd376bcae17d54 (patch)
tree3a4e725ef430b6c71af96c7c855b63732f453c81 /include
parent6936b17ea03f54525f01b12819d558ba52a86b46 (diff)
parentfad9e7d95769ff6c0918b79d58a7ba03615c3ff9 (diff)
downloadlinux-c8e16aa291c7d1ff14d3784e52bd376bcae17d54.tar.xz
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.h3
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 @@
#define __NR_signalfd 349
#define __NR_timerfd 350
#define __NR_eventfd 351
+#define __NR_fallocate 352
#ifdef __KERNEL__
-#define NR_syscalls 352
+#define NR_syscalls 353
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR