diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 00:26:49 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 00:26:49 -0400 |
| commit | 98ed72deebfd2b55b7e1bb94c8175b1169999212 (patch) | |
| tree | f1682a68f65e0a38159f55a58c054779d749f8df /arch/ia64/kernel/entry.S | |
| parent | dbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9 (diff) | |
| parent | 87e807b6c461bbd449496a4c3ab78ab164a4ba97 (diff) | |
Merge /spare/repo/linux-2.6/
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 ba0b6a1f429f..0741b066b98f 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S | |||
| @@ -491,7 +491,7 @@ GLOBAL_ENTRY(prefetch_stack) | |||
| 491 | ;; | 491 | ;; |
| 492 | lfetch.fault [r16], 128 | 492 | lfetch.fault [r16], 128 |
| 493 | br.ret.sptk.many rp | 493 | br.ret.sptk.many rp |
| 494 | END(prefetch_switch_stack) | 494 | END(prefetch_stack) |
| 495 | 495 | ||
| 496 | GLOBAL_ENTRY(execve) | 496 | GLOBAL_ENTRY(execve) |
| 497 | mov r15=__NR_execve // put syscall number in place | 497 | mov r15=__NR_execve // put syscall number in place |