aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/entry_mm.h
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@snapgear.com>2010-09-13 14:10:45 +1000
committerGeert Uytterhoeven <geert@linux-m68k.org>2010-10-22 09:43:24 +0200
commitcddafa3500fde4a07e5bf899ec97a04069f8f7ce (patch)
treecbef023cf9a2d80a1f09d5e80b902780c636236f /arch/m68k/include/asm/entry_mm.h
parentm68k/m68knommu: merge MMU and non-MMU atomic.h (diff)
downloadlinux-dev-cddafa3500fde4a07e5bf899ec97a04069f8f7ce.tar.xz
linux-dev-cddafa3500fde4a07e5bf899ec97a04069f8f7ce.zip
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.h3
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 474125886218..e41fea399bfe 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':