]> 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>
Fri, 19 Aug 2011 06:23:57 +0000 (16:23 +1000)
commit823e2717ec3d9ce4a2c738bb9b125032edd0b4f7
treee3b124ddb39af2151e6c9d985092a1e99a0f5d0d
parentdfc4b504f0246708dff2a88091a6aaa64b352d19
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