diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 19:52:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 19:52:45 -0700 |
| commit | 897f5ab2cd733a77a2279268262919caa8154b9d (patch) | |
| tree | 95866d31faa6db4ec786399296238344c7cfea0c /arch/ia64/kernel/entry.S | |
| parent | 1d42a0ecf478962e8aede355a0be41365c117ff0 (diff) | |
| parent | b48fc7bb3868abffc89ce70d4baf324574338d8e (diff) | |
| download | linux-next-897f5ab2cd733a77a2279268262919caa8154b9d.tar.gz | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
Diffstat (limited to 'arch/ia64/kernel/entry.S')
| -rw-r--r-- | arch/ia64/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index d3f093820bc7..81c45d447394 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -782,7 +782,7 @@ GLOBAL_ENTRY(ia64_ret_from_ia32_execve) st8.spill [r2]=r8 // store return value in slot for r8 and set unat bit .mem.offset 8,0 st8.spill [r3]=r0 // clear error indication in slot for r10 and set unat bit -END(ia64_ret_from_ia32_execve_syscall) +END(ia64_ret_from_ia32_execve) // fall through #endif /* CONFIG_IA32_SUPPORT */ GLOBAL_ENTRY(ia64_leave_kernel) |