diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 12:59:59 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 12:59:59 -0800 |
| commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
| tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /arch/frv/kernel/entry.S | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
| download | linux-ccf18968b1bbc2fb117190a1984ac2a826dac228.tar.gz linux-ccf18968b1bbc2fb117190a1984ac2a826dac228.tar.bz2 linux-ccf18968b1bbc2fb117190a1984ac2a826dac228.zip | |
Merge ../torvalds-2.6/
Diffstat (limited to 'arch/frv/kernel/entry.S')
| -rw-r--r-- | arch/frv/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S index ad10ea595459..5f6548388b74 100644 --- a/arch/frv/kernel/entry.S +++ b/arch/frv/kernel/entry.S @@ -1076,7 +1076,7 @@ __entry_work_notifysig: LEDS 0x6410 ori.p gr4,#0,gr8 call do_notify_resume - bra __entry_return_direct + bra __entry_resume_userspace # perform syscall entry tracing __syscall_trace_entry: |