projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
093e296
)
Merge branch 'bugzilla-14483' into release
author
Len Brown
<len.brown@intel.com>
Wed, 20 Jan 2010 06:14:50 +0000
(
01:14
-0500)
committer
Len Brown
<len.brown@intel.com>
Wed, 20 Jan 2010 06:14:50 +0000
(
01:14
-0500)
include/acpi/platform/aclinux.h
patch
|
blob
|
history
diff --git
a/include/acpi/platform/aclinux.h
b/include/acpi/platform/aclinux.h
index 9d7febde10a172f7bc22f7b72e7ffa6456836788..09469971472fb5587207d5f1517342e479c5abb2 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)