| From cd0c54c10fb3af1115b74b1ddbcd6886c84af5be Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Tue, 21 Jul 2009 22:54:51 +0200 |
| Subject: [PATCH] acpi: Do not disable interrupts on PREEMPT_RT |
| |
| commit cf3d66ac52acec41987926996a665c93e3c4c378 in tip. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| arch/x86/include/asm/acpi.h | 4 ++-- |
| 1 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h |
| index 56f462c..ead7e0b 100644 |
| --- a/arch/x86/include/asm/acpi.h |
| +++ b/arch/x86/include/asm/acpi.h |
| @@ -50,8 +50,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); |
| -- |
| 1.7.0.4 |
| |
