summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorTim Abbott <tabbott@ksplice.com>2009-09-16 12:44:25 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2009-12-06 11:18:24 +0100
commit5cdef24b2ab44ca587d46d212468b0cfb5b83a59 (patch)
tree0ed097e75f36f2bdf42bf36a29eea3fcec3b6ec6 /arch/m68k
parentf60a5572679ef8508b62bd82063b05ffbe838716 (diff)
downloadblackbird-op-linux-5cdef24b2ab44ca587d46d212468b0cfb5b83a59.tar.gz
blackbird-op-linux-5cdef24b2ab44ca587d46d212468b0cfb5b83a59.zip
m68k: Make thread_info.h usable from assembly.
[Geert] <asm/thread_info_mm.h> pulls in <asm/current.h>, which contains C only. So the include must be moved inside #ifndef __ASSEMBLY__. Signed-off-by: Tim Abbott <tabbott@ksplice.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Roman Zippel <zippel@linux-m68k.org> Cc: linux-m68k@lists.linux-m68k.org Cc: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/thread_info_mm.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/thread_info_mm.h b/arch/m68k/include/asm/thread_info_mm.h
index b6da3882be9b..167e518db41b 100644
--- a/arch/m68k/include/asm/thread_info_mm.h
+++ b/arch/m68k/include/asm/thread_info_mm.h
@@ -4,10 +4,12 @@
#ifndef ASM_OFFSETS_C
#include <asm/asm-offsets.h>
#endif
-#include <asm/current.h>
#include <asm/types.h>
#include <asm/page.h>
+#ifndef __ASSEMBLY__
+#include <asm/current.h>
+
struct thread_info {
struct task_struct *task; /* main task structure */
unsigned long flags;
@@ -16,6 +18,7 @@ struct thread_info {
__u32 cpu; /* should always be 0 on m68k */
struct restart_block restart_block;
};
+#endif /* __ASSEMBLY__ */
#define PREEMPT_ACTIVE 0x4000000
OpenPOWER on IntegriCloud