ACPI: fix mis-merge -- invoke acpi_unlazy_tlb() only on C3 entry
authorVenki Pallipadi <venkatesh.pallipadi@intel.com>
Mon, 24 Mar 2008 21:24:10 +0000 (14:24 -0700)
committerLen Brown <len.brown@intel.com>
Wed, 26 Mar 2008 04:40:41 +0000 (00:40 -0400)
commit996520c1fdd2948addb629be56c9febf2967e02b
tree8b8ed0f056985f26eaf2baef9970943520af75e6
parenta4083c9271e0a697278e089f2c0b9a95363ada0a
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>
drivers/acpi/processor_idle.c