Re: [PATCH v2] x86: Merge x86_32 and x86_64 cpu_idle()

[Ingo Molnar]

* Richard Weinberger <richard@xxxxxx> wrote:

> Am 23.03.2012 13:25, schrieb Ingo Molnar:
> >
> >* Richard Weinberger<richard@xxxxxx>  wrote:
> >
> >>Both functions are mostly identical, so we can merge them.
> >>
> >>Signed-off-by: Richard Weinberger<richard@xxxxxx>
> >>---
> >>  arch/x86/include/asm/idle.h  |    1 +
> >>  arch/x86/kernel/process.c    |  114 ++++++++++++++++++++++++++++++++++++++++++
> >>  arch/x86/kernel/process_32.c |   60 ----------------------
> >>  arch/x86/kernel/process_64.c |  109 ----------------------------------------
> >>  4 files changed, 115 insertions(+), 169 deletions(-)
> >
> >Doesn't apply on latest -tip:
> >
> >patching file arch/x86/include/asm/idle.h
> >patching file arch/x86/kernel/process.c
> >Hunk #2 succeeded at 26 with fuzz 2 (offset 1 line).
> >Hunk #3 succeeded at 392 (offset 1 line).
> >patching file arch/x86/kernel/process_32.c
> >Hunk #3 succeeded at 55 (offset 1 line).
> >Hunk #4 FAILED at 65.
> >1 out of 4 hunks FAILED -- rejects in file arch/x86/kernel/process_32.c
> >patching file arch/x86/kernel/process_64.c
> >Hunk #3 FAILED at 48.
> >1 out of 3 hunks FAILED -- rejects in file arch/x86/kernel/process_64.c
> >
> 
> It was based on Linus' tree.

The conflicts were against Linus's tree - the merge window added 
new code there.

> I'll rebase it on -tip.

Thanks!

	Ingo
--
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/