From 76eda6f7bc726e7b7a2ffa0559bdc861b52d8e04 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 23 Oct 2010 20:13:59 +0200 Subject: [PATCH] compat: fix device_lock functions on non rt kernel CONFIG_NONE and CONFIG_PREEMPT_VOLUNTARY are not added by the last RT patch. I have not found any references to CONFIG_NONE, probably CONFIG_PREEMPT_NONE was meant, but that is also wrong like CONFIG_PREEMPT_VOLUNTARY. These two options are also in the normal kernel config system without the rt patch. This patch only checks for KConfig options added by the rt patch, but a rt-patch user could also select PREEMPT_NONE or PREEMPT_VOLUNTARY, and compat-wireless will not build. I do not think this will hapen often, so leave it like this. This patch fixes build with all non rt-kernels. CC: Blaise Gassend Signed-off-by: Hauke Mehrtens --- include/linux/compat-2.6.34.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/include/linux/compat-2.6.34.h b/include/linux/compat-2.6.34.h index 1cfd6e5cda13..f710d08b1c4a 100644 --- a/include/linux/compat-2.6.34.h +++ b/include/linux/compat-2.6.34.h @@ -142,8 +142,7 @@ do { \ static inline void device_lock(struct device *dev) { -#if defined(CONFIG_NONE) || defined(CONFIG_PREEMPT_RT) || \ - defined(CONFIG_PREEMPT_VOLUNTARY) || defined(CONFIG_PREEMPT_DESKTOP) +#if defined(CONFIG_PREEMPT_RT) || defined(CONFIG_PREEMPT_DESKTOP) mutex_lock(&dev->parent->mutex); #else down(&dev->sem); @@ -152,8 +151,7 @@ static inline void device_lock(struct device *dev) static inline int device_trylock(struct device *dev) { -#if defined(CONFIG_NONE) || defined(CONFIG_PREEMPT_RT) || \ - defined(CONFIG_PREEMPT_VOLUNTARY) || defined(CONFIG_PREEMPT_DESKTOP) +#if defined(CONFIG_PREEMPT_RT) || defined(CONFIG_PREEMPT_DESKTOP) return mutex_trylock(&dev->mutex); #else return down_trylock(&dev->sem); @@ -162,8 +160,7 @@ static inline int device_trylock(struct device *dev) static inline void device_unlock(struct device *dev) { -#if defined(CONFIG_NONE) || defined(CONFIG_PREEMPT_RT) || \ - defined(CONFIG_PREEMPT_VOLUNTARY) || defined(CONFIG_PREEMPT_DESKTOP) +#if defined(CONFIG_PREEMPT_RT) || defined(CONFIG_PREEMPT_DESKTOP) mutex_unlock(&dev->mutex); #else up(&dev->sem); -- 2.30.2