linux-kernel - Re: [PATCH v2] x86: Merge x86_32 and x86_64 cpu

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20120323122556.GE13920@gmail.com>
Date:	Fri, 23 Mar 2012 13:25:56 +0100
From:	Ingo Molnar <mingo@...nel.org>
To:	Richard Weinberger <richard@....at>
Cc:	x86@...nel.org, tglx@...utronix.de, mingo@...hat.com,
	hpa@...or.com, paulmck@...ux.vnet.ibm.com, fweisbec@...il.com,
	josh@...htriplett.org, tj@...nel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2] x86: Merge x86_32 and x86_64 cpu_idle()

* Richard Weinberger <richard@....at> wrote:

> Both functions are mostly identical, so we can merge them.
> 
> Signed-off-by: Richard Weinberger <richard@....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

Is a good idea otherwise.

Thanks,

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/