lkml.org 
[lkml]   [2012]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2] x86: Merge x86_32 and x86_64 cpu_idle()
Am 23.03.2012 13:25, schrieb Ingo Molnar:
>
> * Richard Weinberger<richard@nod.at> wrote:
>
>> Both functions are mostly identical, so we can merge them.
>>
>> Signed-off-by: Richard Weinberger<richard@nod.at>
>> ---
>> 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.
I'll rebase it on -tip.

Thanks,
//richard


\
 
 \ /
  Last update: 2012-03-23 13:33    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site