diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-14 13:11:02 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-14 13:11:02 +0200 |
| commit | ac7c5353b189e10cf5dd27399f64f7b013abffc6 (patch) | |
| tree | 8222d92b774c256d6ec4399c716d76b3f05ddc4b /arch/frv/kernel/entry-table.S | |
| parent | [POWERPC] Remove CONFIG_PCI_LEGACY from some configs (diff) | |
| parent | Linux 2.6.25-rc9 (diff) | |
| download | linux-ac7c5353b189e10cf5dd27399f64f7b013abffc6.tar.xz linux-ac7c5353b189e10cf5dd27399f64f7b013abffc6.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/frv/kernel/entry-table.S')
| -rw-r--r-- | arch/frv/kernel/entry-table.S | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/frv/kernel/entry-table.S b/arch/frv/kernel/entry-table.S index d3b9253d862a..bf35f33e48c9 100644 --- a/arch/frv/kernel/entry-table.S +++ b/arch/frv/kernel/entry-table.S @@ -316,8 +316,14 @@ __trap_fixup_kernel_data_tlb_miss: .section .trap.vector .org TBR_TT_TRAP0 >> 2 .long system_call - .rept 126 + .rept 119 .long __entry_unsupported_trap .endr + + # userspace atomic op emulation, traps 120-126 + .rept 7 + .long __entry_atomic_op + .endr + .org TBR_TT_BREAK >> 2 .long __entry_debug_exception |