summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-05 12:14:50 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-05 12:14:50 -0800
commit9b3499d752fc292f37503e5c3a5e5df4f7e76d42 (patch)
tree07f2c8c9d191be7b2b0ad836136be1ef753697fa /drivers/acpi
parentb21172cf6dc6e2af21346e774ea2e7c784de30bd (diff)
parenteda9cec4c9a12208a6f69fbe68f72a6311d50032 (diff)
downloadlinux-9b3499d752fc292f37503e5c3a5e5df4f7e76d42.tar.bz2
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar: "Two fixes: - A PCID related revert that fixes power management and performance regressions. - The module loader robustization and sanity check commit is rather fresh, but it looked like a good idea to apply because of the hidden data corruption problem such invalid modules could cause" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/module: Detect and skip invalid relocations Revert "x86/mm: Stop calling leave_mm() in idle code"
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/processor_idle.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 2736e25e9dc6..d50a7b6ccddd 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -710,6 +710,8 @@ static DEFINE_RAW_SPINLOCK(c3_lock);
static void acpi_idle_enter_bm(struct acpi_processor *pr,
struct acpi_processor_cx *cx, bool timer_bc)
{
+ acpi_unlazy_tlb(smp_processor_id());
+
/*
* Must be done before busmaster disable as we might need to
* access HPET !