diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 15:07:40 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 15:07:40 -0800 |
commit | 906430a99ec8ca48f264e835a264df89fc50dfd4 (patch) | |
tree | 58ed30debffc01a06df2a6a617daa6d33683441b /arch/ia64/kernel/entry.S | |
parent | ba721d318b24154eb7806a8673d3fc030fd39f7e (diff) | |
parent | 0090d481ee4c5d9a54ae2c457ab3ef9111dd4a91 (diff) | |
download | op-kernel-dev-906430a99ec8ca48f264e835a264df89fc50dfd4.zip op-kernel-dev-906430a99ec8ca48f264e835a264df89fc50dfd4.tar.gz |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] xen: fix xen_get_eflags.
[IA64] ia64/pv_ops/pv_cpu_ops: fix _IA64_REG_IP case.
[IA64] remove duplicate include iommu.h
[IA64] use mprintk instead of printk, in ia64_mca_modify_original_stack
[IA64] Rationalize kernel mode alignment checking
Diffstat (limited to 'arch/ia64/kernel/entry.S')
-rw-r--r-- | arch/ia64/kernel/entry.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 7ef0c59..d435f4a 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -499,6 +499,7 @@ GLOBAL_ENTRY(prefetch_stack) END(prefetch_stack) GLOBAL_ENTRY(kernel_execve) + rum psr.ac mov r15=__NR_execve // put syscall number in place break __BREAK_SYSCALL br.ret.sptk.many rp |