linux-next: manual merge of the tip tree with the idle-test tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/kernel/process.c between commits 68855c4b4018 ("x86 idle: move
mwait_idle_with_hints() to where it is used") and 42be29a3d2b7 ("2.6.40:
x86 idle: remove deprecated mwait_idle()") from the idle-test tree and
commit 349c004e3d31 ("x86: A fast way to check capabilities of the
current cpu") from the tip tree.

The former commits move and remove the code changed by the latter.  I
used the tip version but with this merge fix patch:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 5 Apr 2011 13:43:41 +1000
Subject: [PATCH] x86 idle: merge fix for mwait move

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/x86/kernel/acpi/cstate.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c
index c49281e..22de153 100644
--- a/arch/x86/kernel/acpi/cstate.c
+++ b/arch/x86/kernel/acpi/cstate.c
@@ -162,7 +162,7 @@ EXPORT_SYMBOL_GPL(acpi_processor_ffh_cstate_probe);
 static void mwait_idle_with_hints(unsigned long ax, unsigned long cx)
 {
 	if (!need_resched()) {
-		if (cpu_has(__this_cpu_ptr(&cpu_info), X86_FEATURE_CLFLUSH_MONITOR))
+		if (this_cpu_has(X86_FEATURE_CLFLUSH_MONITOR))
 			clflush((void *)&current_thread_info()->flags);
 
 		__monitor((void *)&current_thread_info()->flags, 0, 0);
-- 
1.7.4.1


-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
--
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/