28 lines
938 B
Diff
28 lines
938 B
Diff
From 44913098876e86912b081f20488dd31efa2cb281 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Tue, 21 Jul 2009 22:54:51 +0200
|
|
Subject: [068/254] acpi: Do not disable interrupts on PREEMPT_RT
|
|
|
|
Use the local_irq_*_nort() variants.
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
arch/x86/include/asm/acpi.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
|
|
index 610001d..c1c23d2 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);
|