Skip to content

Commit

Permalink
m68k: Make thread_info.h usable from assembly.
Browse files Browse the repository at this point in the history
[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>
  • Loading branch information
Tim Abbott authored and Geert Uytterhoeven committed Dec 6, 2009
1 parent f60a557 commit 5cdef24
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion arch/m68k/include/asm/thread_info_mm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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

Expand Down

0 comments on commit 5cdef24

Please sign in to comment.