projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git]
/
arch
/
ia64
/
kernel
/
entry.S
diff --git
a/arch/ia64/kernel/entry.S
b/arch/ia64/kernel/entry.S
index
fef0657
..
e7873ee
100644
(file)
--- a/
arch/ia64/kernel/entry.S
+++ b/
arch/ia64/kernel/entry.S
@@
-1,5
+1,5
@@
/*
/*
- * ia64/kernel/entry.S
+ *
arch/
ia64/kernel/entry.S
*
* Kernel entry points.
*
*
* Kernel entry points.
*
@@
-492,11
+492,11
@@
GLOBAL_ENTRY(prefetch_stack)
br.ret.sptk.many rp
END(prefetch_stack)
br.ret.sptk.many rp
END(prefetch_stack)
-GLOBAL_ENTRY(execve)
+GLOBAL_ENTRY(
kernel_
execve)
mov r15=__NR_execve // put syscall number in place
break __BREAK_SYSCALL
br.ret.sptk.many rp
mov r15=__NR_execve // put syscall number in place
break __BREAK_SYSCALL
br.ret.sptk.many rp
-END(execve)
+END(
kernel_
execve)
GLOBAL_ENTRY(clone)
mov r15=__NR_clone // put syscall number in place
GLOBAL_ENTRY(clone)
mov r15=__NR_clone // put syscall number in place
@@
-1575,7
+1575,7
@@
sys_call_table:
data8 sys_mq_timedreceive // 1265
data8 sys_mq_notify
data8 sys_mq_getsetattr
data8 sys_mq_timedreceive // 1265
data8 sys_mq_notify
data8 sys_mq_getsetattr
- data8 sys_
ni_syscall // reserved for
kexec_load
+ data8 sys_kexec_load
data8 sys_ni_syscall // reserved for vserver
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_ni_syscall // reserved for vserver
data8 sys_waitid // 1270
data8 sys_add_key
@@
-1605,10
+1605,12
@@
sys_call_table:
data8 sys_ni_syscall // 1295 reserved for ppoll
data8 sys_unshare
data8 sys_splice
data8 sys_ni_syscall // 1295 reserved for ppoll
data8 sys_unshare
data8 sys_splice
- data8 sys_
ni_syscall // reserved for
set_robust_list
- data8 sys_
ni_syscall // reserved for
get_robust_list
+ data8 sys_set_robust_list
+ data8 sys_get_robust_list
data8 sys_sync_file_range // 1300
data8 sys_tee
data8 sys_vmsplice
data8 sys_sync_file_range // 1300
data8 sys_tee
data8 sys_vmsplice
+ data8 sys_ni_syscall // reserved for move_pages
+ data8 sys_getcpu
.org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
.org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls