]> 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, 18 Oct 2011 04:22:36 +0000 (14:22 +1000)
commita0421ae221c985e0f758b5af15b487f9c605bbbe
treee1971eca6707ddc7fad852a6c7e29a3ad8766aee
parentaffe70c02dadc16be2625c8b09586cb5040654b3
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