diff options
author | Greg Ungerer <gerg@snapgear.com> | 2010-09-13 14:10:45 +1000 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2010-10-22 09:43:24 +0200 |
commit | cddafa3500fde4a07e5bf899ec97a04069f8f7ce (patch) | |
tree | cbef023cf9a2d80a1f09d5e80b902780c636236f /arch/m68k/include/asm/entry_mm.h | |
parent | 69f99746a2cfd88b9caed8e320ad86405b228ada (diff) |
m68k/m68knommu: merge MMU and non-MMU thread_info.h
The MMU and non-MMU versions of thread_info.h are quite similar.
Merge the two files.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/entry_mm.h')
-rw-r--r-- | arch/m68k/include/asm/entry_mm.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/entry_mm.h b/arch/m68k/include/asm/entry_mm.h index 47412588621..e41fea399bf 100644 --- a/arch/m68k/include/asm/entry_mm.h +++ b/arch/m68k/include/asm/entry_mm.h @@ -3,6 +3,9 @@ #include <asm/setup.h> #include <asm/page.h> +#ifdef __ASSEMBLY__ +#include <asm/thread_info.h> +#endif /* * Stack layout in 'ret_from_exception': |