diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-31 11:32:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 16:30:01 -0500 |
| commit | 9d45cf9e36bf9bcf16df6e1cbf049807c8402823 (patch) | |
| tree | 2118a16701418af10d215d2174df7ee0a5cbe6bd /arch/alpha/kernel/entry.S | |
| parent | a146649bc19d5eba4f5bfac6720c5f252d517a71 (diff) | |
| parent | 0cd5c3c80a0ebd68c08312fa7d8c13149cc61c4c (diff) | |
Merge branch 'x86/urgent' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic merge:
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/alpha/kernel/entry.S')
| -rw-r--r-- | arch/alpha/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index aa2e50cf9857..e4a54b615894 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S | |||
| @@ -933,7 +933,7 @@ sys_execve: | |||
| 933 | osf_sigprocmask: | 933 | osf_sigprocmask: |
| 934 | .prologue 0 | 934 | .prologue 0 |
| 935 | mov $sp, $18 | 935 | mov $sp, $18 |
| 936 | jmp $31, do_osf_sigprocmask | 936 | jmp $31, sys_osf_sigprocmask |
| 937 | .end osf_sigprocmask | 937 | .end osf_sigprocmask |
| 938 | 938 | ||
| 939 | .align 4 | 939 | .align 4 |