diff options
author | Tim Abbott <tabbott@ksplice.com> | 2009-09-16 12:44:25 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-12-06 05:18:24 -0500 |
commit | 5cdef24b2ab44ca587d46d212468b0cfb5b83a59 (patch) | |
tree | 0ed097e75f36f2bdf42bf36a29eea3fcec3b6ec6 /arch/m68k/include/asm | |
parent | f60a5572679ef8508b62bd82063b05ffbe838716 (diff) |
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/include/asm')
-rw-r--r-- | arch/m68k/include/asm/thread_info_mm.h | 5 |
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 @@ | |||
4 | #ifndef ASM_OFFSETS_C | 4 | #ifndef ASM_OFFSETS_C |
5 | #include <asm/asm-offsets.h> | 5 | #include <asm/asm-offsets.h> |
6 | #endif | 6 | #endif |
7 | #include <asm/current.h> | ||
8 | #include <asm/types.h> | 7 | #include <asm/types.h> |
9 | #include <asm/page.h> | 8 | #include <asm/page.h> |
10 | 9 | ||
10 | #ifndef __ASSEMBLY__ | ||
11 | #include <asm/current.h> | ||
12 | |||
11 | struct thread_info { | 13 | struct thread_info { |
12 | struct task_struct *task; /* main task structure */ | 14 | struct task_struct *task; /* main task structure */ |
13 | unsigned long flags; | 15 | unsigned long flags; |
@@ -16,6 +18,7 @@ struct thread_info { | |||
16 | __u32 cpu; /* should always be 0 on m68k */ | 18 | __u32 cpu; /* should always be 0 on m68k */ |
17 | struct restart_block restart_block; | 19 | struct restart_block restart_block; |
18 | }; | 20 | }; |
21 | #endif /* __ASSEMBLY__ */ | ||
19 | 22 | ||
20 | #define PREEMPT_ACTIVE 0x4000000 | 23 | #define PREEMPT_ACTIVE 0x4000000 |
21 | 24 | ||