From: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date: Mon, 24 Mar 2008 21:24:10 +0000 (-0700)
Subject: ACPI: fix mis-merge -- invoke acpi_unlazy_tlb() only on C3 entry
X-Git-Tag: v2.6.25-rc8~75^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=996520c1fdd2948addb629be56c9febf2967e02b;p=pandora-kernel.git

ACPI: fix mis-merge -- invoke acpi_unlazy_tlb() only on C3 entry

This original patch
http://ussg.iu.edu/hypermail/linux/kernel/0712.2/1451.html
was intending to add acpi_unlazy_tlb() to acpi_idle_enter_bm(),
which is used for C3 entry.

But it was merged incorrectly as commmit

bde6f5f59c2b2b48a7a849c129d5b48838fe77ee
'x86: voluntary leave_mm before entering ACPI C3'

so the call was instead added to acpi_idle_enter_simple()
(which is C2 entry routine), probably due to identical
context in that function.

Move the call back to acpi_idle_enter_bm().

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---

Reading git-diff-tree failed