diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 03:51:22 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-14 03:51:22 +0200 |
commit | a45d572841a24db02a62cf05e1157c35fdd3705b (patch) | |
tree | 35a25d5843e0dc29abd64b5d9f0cfc1b1d1acd17 /arch/m68k/68000/romvec.S | |
parent | fc2414b4b4569fab5404c6f49f36bae0dfa3d936 (diff) | |
parent | e803d4bd31184b301a54352bb2c1a3fa93f80154 (diff) |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu update from Greg Ungerer:
"The major change is to remove the arch/m68k/platform directory. The
coldfire (and other non-mmu m68k platform) code is moved to the
arch/m68k level, making them consistent with the traditional m68k
platforms.
A couple of other minor miscellaneous fixes as well"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: Fix typo 'COFNIG_MBAR'
m68knommu: add missing ioport_map() and ioport_unmap()
m68k/coldfire: remove second asm/mcfclk.h inclusion in m54xx.c
m68knommu: fix size of address field for 5272 interrupt controller
m68k: fix crufty 68000 and 68360 intro comments
m68k: remove the unused arch/m68k/platform directory
m68k: move non-mmu 68360 platform code
m68k: move non-mmu 68000 platform code
m68k: fix crufty ColdFire intro comments
m68k: move coldfire platform code
Diffstat (limited to 'arch/m68k/68000/romvec.S')
-rw-r--r-- | arch/m68k/68000/romvec.S | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/arch/m68k/68000/romvec.S b/arch/m68k/68000/romvec.S new file mode 100644 index 000000000000..15c70cd6453f --- /dev/null +++ b/arch/m68k/68000/romvec.S @@ -0,0 +1,35 @@ +/* + * romvec.S - Vector table for 68000 cpus + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive + * for more details. + * + * Copyright 1996 Roman Zippel + * Copyright 1999 D. Jeff Dionne <jeff@rt-control.com> + * Copyright 2006 Greg Ungerer <gerg@snapgear.com> + */ + +.global _start +.global _buserr +.global trap +.global system_call + +.section .romvec + +e_vectors: +.long CONFIG_RAMBASE+CONFIG_RAMSIZE-4, _start, buserr, trap +.long trap, trap, trap, trap +.long trap, trap, trap, trap +.long trap, trap, trap, trap +.long trap, trap, trap, trap +.long trap, trap, trap, trap +.long trap, trap, trap, trap +.long trap, trap, trap, trap +/* TRAP #0-15 */ +.long system_call, trap, trap, trap +.long trap, trap, trap, trap +.long trap, trap, trap, trap +.long trap, trap, trap, trap +.long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + |