]> git.karo-electronics.de Git - karo-tx-linux.git/commit
m68k: merge mmu and non-mmu include/asm/entry.h files
authorGreg Ungerer <gerg@uclinux.org>
Wed, 22 Jun 2011 03:50:44 +0000 (13:50 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Tue, 23 Aug 2011 02:12:17 +0000 (12:12 +1000)
commitf14164a856021224f6285527f20133e712f25249
tree4ff1701ff6c8c74123d9147d19a9bb9f49dd1e9a
parent6a99b7dde75adaa06c4ae8f0706fb6c07f69e1e4
m68k: merge mmu and non-mmu include/asm/entry.h files

The changes in the mmu version of entry.h (entry_mm.h) and the non-mmu
version (entry_no.h) are not about the presence or use of an MMU at all.
The main changes are to support the ColdFire processors. The code for
trap entry and exit for all types of 68k processor outside coldfire is
the same.

So merge the files back to a single entry.h and share the common 68k
entry/exit code. Some changes are required for the non-mmu entry
handlers to adopt the differing macros for system call and interrupt
entry, but this is quite strait forward. The changes for the ColdFire
remove a couple of instructions for the separate a7 register case, and
are no worse for the older single a7 register case.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
arch/m68k/include/asm/entry.h
arch/m68k/include/asm/entry_mm.h [deleted file]
arch/m68k/include/asm/entry_no.h [deleted file]
arch/m68k/kernel/entry_no.S
arch/m68k/platform/68328/entry.S
arch/m68k/platform/68360/entry.S
arch/m68k/platform/coldfire/entry.S