summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-07-21 20:54:51 (GMT)
committerScott Wood <scottwood@freescale.com>2013-04-04 22:09:13 (GMT)
commit6d56ea8fa272ebe66cff738166e9658531d03615 (patch)
tree97e0c1f941bd1a7234ca577b3985468f94a16026 /arch
parent1394824856a601cb9212dafdb930f0704b2fb512 (diff)
downloadlinux-fsl-qoriq-6d56ea8fa272ebe66cff738166e9658531d03615.tar.xz
acpi: Do not disable interrupts on PREEMPT_RT
Use the local_irq_*_nort() variants. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/acpi.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 0c44630..1785dd7 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -51,8 +51,8 @@
#define ACPI_ASM_MACROS
#define BREAKPOINT3
-#define ACPI_DISABLE_IRQS() local_irq_disable()
-#define ACPI_ENABLE_IRQS() local_irq_enable()
+#define ACPI_DISABLE_IRQS() local_irq_disable_nort()
+#define ACPI_ENABLE_IRQS() local_irq_enable_nort()
#define ACPI_FLUSH_CPU_CACHE() wbinvd()
int __acpi_acquire_global_lock(unsigned int *lock);