summaryrefslogtreecommitdiffstats
path: root/arch/microblaze/kernel/syscall_table.S
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-04-07 11:15:50 -0700
committerGrant Likely <grant.likely@secretlab.ca>2011-04-07 11:15:50 -0700
commit454abcc57f1d48a976291bc4af73b5f087e21d70 (patch)
tree5bba999ea3f31527da02b60604531cc5fb52ea57 /arch/microblaze/kernel/syscall_table.S
parent88aab9341a315d81118be6b41c45e4fe32b94bc1 (diff)
parent6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff)
downloadblackbird-op-linux-454abcc57f1d48a976291bc4af73b5f087e21d70.tar.gz
blackbird-op-linux-454abcc57f1d48a976291bc4af73b5f087e21d70.zip
Merge commit 'v2.6.39-rc2' into spi/merge
Diffstat (limited to 'arch/microblaze/kernel/syscall_table.S')
-rw-r--r--arch/microblaze/kernel/syscall_table.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S
index e88a930fd1e3..85cea81d1ca1 100644
--- a/arch/microblaze/kernel/syscall_table.S
+++ b/arch/microblaze/kernel/syscall_table.S
@@ -375,3 +375,7 @@ ENTRY(sys_call_table)
.long sys_fanotify_init
.long sys_fanotify_mark
.long sys_prlimit64 /* 370 */
+ .long sys_name_to_handle_at
+ .long sys_open_by_handle_at
+ .long sys_clock_adjtime
+ .long sys_syncfs
OpenPOWER on IntegriCloud