Index: chromeos/compat-wireless/include/linux/compat-2.6.34.h |
diff --git a/chromeos/compat-wireless/include/linux/compat-2.6.34.h b/chromeos/compat-wireless/include/linux/compat-2.6.34.h |
index 336c61b261695fc5014917e80c3f50c576dc3c0d..763abcacfca114c621c4729db66960065b0d8d49 100644 |
--- a/chromeos/compat-wireless/include/linux/compat-2.6.34.h |
+++ b/chromeos/compat-wireless/include/linux/compat-2.6.34.h |
@@ -142,17 +142,29 @@ do { \ |
static inline void device_lock(struct device *dev) |
{ |
+#if defined(CONFIG_PREEMPT_RT) || defined(CONFIG_PREEMPT_DESKTOP) |
+ mutex_lock(&dev->mutex); |
+#else |
down(&dev->sem); |
+#endif |
} |
static inline int device_trylock(struct device *dev) |
{ |
+#if defined(CONFIG_PREEMPT_RT) || defined(CONFIG_PREEMPT_DESKTOP) |
+ return mutex_trylock(&dev->mutex); |
+#else |
return down_trylock(&dev->sem); |
+#endif |
} |
static inline void device_unlock(struct device *dev) |
{ |
+#if defined(CONFIG_PREEMPT_RT) || defined(CONFIG_PREEMPT_DESKTOP) |
+ mutex_unlock(&dev->mutex); |
+#else |
up(&dev->sem); |
+#endif |
} |
#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE) |