projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' into for-linus
[cascardo/linux.git]
/
include
/
acpi
/
platform
/
aclinux.h
diff --git
a/include/acpi/platform/aclinux.h
b/include/acpi/platform/aclinux.h
index
9d7febd
..
0946997
100644
(file)
--- a/
include/acpi/platform/aclinux.h
+++ b/
include/acpi/platform/aclinux.h
@@
-152,7
+152,7
@@
static inline void *acpi_os_acquire_object(acpi_cache_t * cache)
#include <linux/hardirq.h>
#define ACPI_PREEMPTION_POINT() \
do { \
- if (!in_atomic_preempt_off()) \
+ if (!in_atomic_preempt_off()
&& !irqs_disabled()
) \
cond_resched(); \
} while (0)