diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-06-23 07:52:25 +0200 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-07-25 03:20:41 +0200 |
| commit | 622e9472dd723d5c7dc034510faae4b113e5bbc2 (patch) | |
| tree | 468728239c79b081a9e7739e627728462eb9579e /arch/m68k/include/asm/traps.h | |
| parent | m68knommu: merge ColdFire 5206 and 5206e platform code (diff) | |
| download | linux-622e9472dd723d5c7dc034510faae4b113e5bbc2.tar.xz linux-622e9472dd723d5c7dc034510faae4b113e5bbc2.zip | |
m68knommu: correctly use trap_init
Currently trap_init() is an empty function for m68knommu. Instead
the vectors are being setup as part of the IRQ initialization.
This is inconsistent with m68k and other architectures.
Change the local init_vectors() to be trap_init(), and init the
vectors at the correct time during startup. This will help merge of
m68k and m68knommu trap code in the furture.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/include/asm/traps.h')
| -rw-r--r-- | arch/m68k/include/asm/traps.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/traps.h b/arch/m68k/include/asm/traps.h index 0bffb17d5db7..151068f64f44 100644 --- a/arch/m68k/include/asm/traps.h +++ b/arch/m68k/include/asm/traps.h @@ -22,7 +22,6 @@ extern e_vector vectors[]; asmlinkage void auto_inthandler(void); asmlinkage void user_inthandler(void); asmlinkage void bad_inthandler(void); -extern void init_vectors(void); #endif |