Commit 5cdef24b authored by Tim Abbott's avatar Tim Abbott Committed by Geert Uytterhoeven

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: default avatarTim 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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent f60a5572
...@@ -4,10 +4,12 @@ ...@@ -4,10 +4,12 @@
#ifndef ASM_OFFSETS_C #ifndef ASM_OFFSETS_C
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
#endif #endif
#include <asm/current.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/page.h> #include <asm/page.h>
#ifndef __ASSEMBLY__
#include <asm/current.h>
struct thread_info { struct thread_info {
struct task_struct *task; /* main task structure */ struct task_struct *task; /* main task structure */
unsigned long flags; unsigned long flags;
...@@ -16,6 +18,7 @@ struct thread_info { ...@@ -16,6 +18,7 @@ struct thread_info {
__u32 cpu; /* should always be 0 on m68k */ __u32 cpu; /* should always be 0 on m68k */
struct restart_block restart_block; struct restart_block restart_block;
}; };
#endif /* __ASSEMBLY__ */
#define PREEMPT_ACTIVE 0x4000000 #define PREEMPT_ACTIVE 0x4000000
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment