diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 10:16:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 10:16:47 -0700 |
| commit | abf914208a1e120446ea4f9bc26406bd3a4579e1 (patch) | |
| tree | 00ccb529b9e4266268f98df4f14325c259d9ed50 /arch/arm/kernel | |
| parent | 0aaaa028297a0e2aed9671419a11d8e17510cb51 (diff) | |
| parent | daad56661d56cc382948fc95b74e17d3326b901b (diff) | |
| download | kernel_samsung_tuna-abf914208a1e120446ea4f9bc26406bd3a4579e1.zip kernel_samsung_tuna-abf914208a1e120446ea4f9bc26406bd3a4579e1.tar.gz kernel_samsung_tuna-abf914208a1e120446ea4f9bc26406bd3a4579e1.tar.bz2 | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/calls.S | 5 | ||||
| -rw-r--r-- | arch/arm/kernel/entry-common.S | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index db07ce4..949ec44 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S @@ -10,7 +10,7 @@ * This file is included twice in entry-common.S */ #ifndef NR_syscalls -#define NR_syscalls 320 +#define NR_syscalls 328 #else __syscall_start: @@ -333,6 +333,9 @@ __syscall_start: .long sys_inotify_init .long sys_inotify_add_watch .long sys_inotify_rm_watch + .long sys_mbind_wrapper +/* 320 */ .long sys_get_mempolicy + .long sys_set_mempolicy __syscall_end: .rept NR_syscalls - (__syscall_end - __syscall_start) / 4 diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 6281d48..db302c6 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -269,6 +269,10 @@ sys_arm_fadvise64_64_wrapper: str r5, [sp, #4] @ push r5 to stack b sys_arm_fadvise64_64 +sys_mbind_wrapper: + str r5, [sp, #4] + b sys_mbind + /* * Note: off_4k (r5) is always units of 4K. If we can't do the requested * offset, we return EINVAL. |