Re: [PATCH] m68k: skip futex_atomic_cmpxchg_inatomic() test

Re: [PATCH] m68k: skip futex_atomic_cmpxchg_inatomic() test

[Geert Uytterhoeven]

On Tue, Mar 4, 2014 at 8:28 AM, Finn Thain <fthain@telegraphics.com.au> wrote:
> The futex_atomic_cmpxchg_inatomic() test in futex_init() causes a fatal
> exception on 68030 (and presumably 68020 also).

Thanks!

> Signed-off-by: Finn Thain <fthain@telegraphics.com.au>

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

> ---
>
> Ingo Molnar has committed Heiko Carstens' patch to the -tip repo:

You mean Thomas Gleixner? ;-)

> http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?id=03b8c7b623c80af264c4c8d6111e5c6289933666
>
> I downloaded that patch and tested it along with the patch below, and
> together these fix the boot crash.
>
> What's the best way to merge this? Perhaps it should be sent on to the
> -tip maintainers?

Yes, please.

And when it's in Linus' tree, we'll have to invoke -stable.

> Index: linux-m68k/arch/m68k/Kconfig
> ===================================================================
> --- linux-m68k.orig/arch/m68k/Kconfig
> +++ linux-m68k/arch/m68k/Kconfig
> @@ -17,6 +17,7 @@ config M68K
>         select FPU if MMU
>         select ARCH_WANT_IPC_PARSE_VERSION
>         select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE
> +       select HAVE_FUTEX_CMPXCHG if MMU && FUTEX
>         select HAVE_MOD_ARCH_SPECIFIC
>         select MODULES_USE_ELF_REL
>         select MODULES_USE_ELF_RELA

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

Re: [PATCH] m68k: skip futex_atomic_cmpxchg_inatomic() test

[Thomas Gleixner]

On Wed, 5 Mar 2014, Geert Uytterhoeven wrote:

> On Tue, Mar 4, 2014 at 8:28 AM, Finn Thain <fthain@telegraphics.com.au> wrote:
> > The futex_atomic_cmpxchg_inatomic() test in futex_init() causes a fatal
> > exception on 68030 (and presumably 68020 also).
> 
> Thanks!
> 
> > Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
> 
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
> 
> > ---
> >
> > Ingo Molnar has committed Heiko Carstens' patch to the -tip repo:
> 
> You mean Thomas Gleixner? ;-)
> 
> > http://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?id=03b8c7b623c80af264c4c8d6111e5c6289933666
> >
> > I downloaded that patch and tested it along with the patch below, and
> > together these fix the boot crash.
> >
> > What's the best way to merge this? Perhaps it should be sent on to the
> > -tip maintainers?
> 
> Yes, please.

Just post it to LKML and cc me please.

Thanks,

	tglx
	

[PATCH] m68k: skip futex_atomic_cmpxchg_inatomic() test

[Finn Thain]

Skip the futex_atomic_cmpxchg_inatomic() test in futex_init(). It causes a 
fatal exception on 68030 (and presumably 68020 also).

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Index: linux-m68k/arch/m68k/Kconfig
===================================================================
--- linux-m68k.orig/arch/m68k/Kconfig
+++ linux-m68k/arch/m68k/Kconfig
@@ -17,6 +17,7 @@ config M68K
 	select FPU if MMU
 	select ARCH_WANT_IPC_PARSE_VERSION
 	select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE
+	select HAVE_FUTEX_CMPXCHG if MMU && FUTEX
 	select HAVE_MOD_ARCH_SPECIFIC
 	select MODULES_USE_ELF_REL
 	select MODULES_USE_ELF_RELA

[tip:core/locking] m68k: Skip futex_atomic_cmpxchg_inatomic() test

[tip-bot for Finn Thain]

Commit-ID:  e571c58f313d35c56e0018470e3375ddd1fd320e
Gitweb:     http://git.kernel.org/tip/e571c58f313d35c56e0018470e3375ddd1fd320e
Author:     Finn Thain <fthain@telegraphics.com.au>
AuthorDate: Thu, 6 Mar 2014 10:29:27 +1100
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 6 Mar 2014 11:35:17 +0100

m68k: Skip futex_atomic_cmpxchg_inatomic() test

Skip the futex_atomic_cmpxchg_inatomic() test in futex_init(). It causes a 
fatal exception on 68030 (and presumably 68020 also).

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: http://lkml.kernel.org/r/alpine.LNX.2.00.1403061006440.5525@nippy.intranet
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
 arch/m68k/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index dbdd223..b2e3229 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -17,6 +17,7 @@ config M68K
 	select FPU if MMU
 	select ARCH_WANT_IPC_PARSE_VERSION
 	select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE
+	select HAVE_FUTEX_CMPXCHG if MMU && FUTEX
 	select HAVE_MOD_ARCH_SPECIFIC
 	select MODULES_USE_ELF_REL
 	select MODULES_USE_ELF_RELA