Re: [PATCH v2 1/2] m68k: Make thread_info.h usable from assembly.

[Geert Uytterhoeven <geert@linux-m68k.org>]

On Wed, Sep 16, 2009 at 18:44, Tim Abbott <tabbott@ksplice.com> wrote:
> 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>
> ---
>  arch/m68k/include/asm/thread_info_mm.h |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/m68k/include/asm/thread_info_mm.h b/arch/m68k/include/asm/thread_info_mm.h
> index b6da388..5f36cf1 100644
> --- a/arch/m68k/include/asm/thread_info_mm.h
> +++ b/arch/m68k/include/asm/thread_info_mm.h
> @@ -8,6 +8,7 @@
>  #include <asm/types.h>
>  #include <asm/page.h>
>
> +#ifndef __ASSEMBLY__
>  struct thread_info {
>        struct task_struct      *task;          /* main task structure */
>        unsigned long           flags;
> @@ -16,6 +17,7 @@ struct thread_info {
>        __u32 cpu; /* should always be 0 on m68k */
>        struct restart_block    restart_block;
>  };
> +#endif /* __ASSEMBLY__ */
>
>  #define PREEMPT_ACTIVE         0x4000000

This is not sufficient. <asm/thread_info_mm.h> pulls in <asm/current.h>,
which contains C only. So you also need:

--- a/arch/m68k/include/asm/thread_info_mm.h
+++ b/arch/m68k/include/asm/thread_info_mm.h
@@ -4,11 +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;


Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds