summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include
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 /arch/ia64/include
parentb21172cf6dc6e2af21346e774ea2e7c784de30bd (diff)
parenteda9cec4c9a12208a6f69fbe68f72a6311d50032 (diff)
downloadop-kernel-dev-9b3499d752fc292f37503e5c3a5e5df4f7e76d42.zip
op-kernel-dev-9b3499d752fc292f37503e5c3a5e5df4f7e76d42.tar.gz
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 'arch/ia64/include')
-rw-r--r--arch/ia64/include/asm/acpi.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
index c86a947..a3d0211 100644
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -112,6 +112,8 @@ static inline void arch_acpi_set_pdc_bits(u32 *buf)
buf[2] |= ACPI_PDC_EST_CAPABILITY_SMP;
}
+#define acpi_unlazy_tlb(x)
+
#ifdef CONFIG_ACPI_NUMA
extern cpumask_t early_cpu_possible_map;
#define for_each_possible_early_cpu(cpu) \
OpenPOWER on IntegriCloud