summaryrefslogtreecommitdiffstats
path: root/include/asm-m68k
diff options
context:
space:
mode:
authorVenki Pallipadi <venkatesh.pallipadi@intel.com>2008-03-24 14:24:10 -0700
committerLen Brown <len.brown@intel.com>2008-03-26 00:40:41 -0400
commit996520c1fdd2948addb629be56c9febf2967e02b (patch)
tree8b8ed0f056985f26eaf2baef9970943520af75e6 /include/asm-m68k
parenta4083c9271e0a697278e089f2c0b9a95363ada0a (diff)
downloadop-kernel-dev-996520c1fdd2948addb629be56c9febf2967e02b.zip
op-kernel-dev-996520c1fdd2948addb629be56c9febf2967e02b.tar.gz
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>
Diffstat (limited to 'include/asm-m68k')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud