Re: linux-next: manual merge of the m68knommu tree with the m68k tree

[Geert Uytterhoeven]

On Thu, Nov 26, 2009 at 01:58, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the m68knommu tree got a conflict in
> arch/m68k/include/asm/ptrace.h between commit
> 63c361b65f6540043c4baabf1a044a45c7465858 ("m68k: use generic code for
> ptrace requests") from the m68k tree and commit
> 03a03164e8084b810e9f92906a51232d63bac72c ("m68knommu: define
> arch_has_single_step() and friends") from the m68knommu tree.
>
> These mostly add the same stuff but not quite :-(

Ah sorry, my bad. I'm not yet used to the uClinux guys touching "my"
includes ;-)
So we need better coordination between us.

IIRC, Greg's changes were inspired by Andreas' patch.

> I have done a fixup (see below) and can carry it as necessary. ÂPlease
> check the result.

At first sight, it looks OK. Thanks for fixing it up!

> --
> Cheers,
> Stephen Rothwell          Âsfr@xxxxxxxxxxxxxxxx
>
> diff --cc arch/m68k/include/asm/ptrace.h
> index eef9309,beb2091..0000000
> --- a/arch/m68k/include/asm/ptrace.h
> +++ b/arch/m68k/include/asm/ptrace.h
> @@@ -86,14 -84,15 +86,18 @@@ struct switch_stack
> Âextern void show_regs(struct pt_regs *);
>
> Â/*
> Â- * These are defined as per linux/ptrace.h.
> Â+ * These are defined as per linux/ptrace.h, which see.
> Â */
> + struct task_struct;
> +
> Â-#ifndef CONFIG_MMU
> Â-#define    arch_has_single_step() Â(1)
> Â+#define arch_has_single_step() Â Â Â Â(1)
> Âextern void user_enable_single_step(struct task_struct *);
> Âextern void user_disable_single_step(struct task_struct *);
> Â+
> ++#ifdef CONFIG_MMU
> Â+#define arch_has_block_step() (1)
> Â+extern void user_enable_block_step(struct task_struct *);
> + #endif
>
> Â#endif /* __KERNEL__ */
> Â#endif /* __ASSEMBLY__ */

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/