[PATCH 1/3] compat: add an empty definition for __rcu

[PATCH 1/3] compat: add an empty definition for __rcu

[Felix Fietkau]

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
 include/linux/compat-2.6.36.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/include/linux/compat-2.6.36.h b/include/linux/compat-2.6.36.h
index 806993b..7a82522 100644
--- a/include/linux/compat-2.6.36.h
+++ b/include/linux/compat-2.6.36.h
@@ -120,6 +120,9 @@ static inline void tty_unlock(void) __releases(kernel_lock)
 #define tty_locked()           (kernel_locked())
 
 #define usleep_range(_min, _max)	msleep((_max) / 1000)
+
+#define __rcu
+
 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) */
 
 #endif /* LINUX_26_36_COMPAT_H */
-- 
1.7.3.2

[PATCH 2/3] compat: backport PCI_EEPROM_WIDTH_93C86

[Felix Fietkau]

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
 include/linux/compat-2.6.36.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/linux/compat-2.6.36.h b/include/linux/compat-2.6.36.h
index 7a82522..2d756d1 100644
--- a/include/linux/compat-2.6.36.h
+++ b/include/linux/compat-2.6.36.h
@@ -123,6 +123,8 @@ static inline void tty_unlock(void) __releases(kernel_lock)
 
 #define __rcu
 
+#define PCI_EEPROM_WIDTH_93C86	8
+
 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) */
 
 #endif /* LINUX_26_36_COMPAT_H */
-- 
1.7.3.2

[PATCH 3/3] compat: backport rcu_dereference_protected

[Felix Fietkau]

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
 include/linux/compat-2.6.34.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/linux/compat-2.6.34.h b/include/linux/compat-2.6.34.h
index f6ffde0..d1f9d80 100644
--- a/include/linux/compat-2.6.34.h
+++ b/include/linux/compat-2.6.34.h
@@ -246,6 +246,8 @@ static inline int usb_disable_autosuspend(struct usb_device *udev)
 #define MMC_PM_KEEP_POWER	(1 << 0)	/* preserve card power during suspend */
 #define sdio_set_host_pm_flags(a, b) 0
 
+#define rcu_dereference_protected(p, c) (p)
+
 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)) */
 
 #endif /* LINUX_26_34_COMPAT_H */
-- 
1.7.3.2

Re: [PATCH 2/3] compat: backport PCI_EEPROM_WIDTH_93C86

[Hauke Mehrtens]

On 05/16/2011 07:43 PM, Felix Fietkau wrote:
> Signed-off-by: Felix Fietkau <nbd@openwrt.org>
> ---
>  include/linux/compat-2.6.36.h |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/include/linux/compat-2.6.36.h b/include/linux/compat-2.6.36.h
> index 7a82522..2d756d1 100644
> --- a/include/linux/compat-2.6.36.h
> +++ b/include/linux/compat-2.6.36.h
> @@ -123,6 +123,8 @@ static inline void tty_unlock(void) __releases(kernel_lock)
>  
>  #define __rcu
>  
> +#define PCI_EEPROM_WIDTH_93C86	8
> +
>  #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) */
>  
>  #endif /* LINUX_26_36_COMPAT_H */

NACK on this patch.

PCI_EEPROM_WIDTH_93C86 is already defined in
include/linux/eeprom_93cx6.h which is shipped with compat-wireless.

Hauke

Re: [PATCH 2/3] compat: backport PCI_EEPROM_WIDTH_93C86

[Felix Fietkau]

On 2011-05-16 8:17 PM, Hauke Mehrtens wrote:
> On 05/16/2011 07:43 PM, Felix Fietkau wrote:
>>  Signed-off-by: Felix Fietkau<nbd@openwrt.org>
>>  ---
>>   include/linux/compat-2.6.36.h |    2 ++
>>   1 files changed, 2 insertions(+), 0 deletions(-)
>>
>>  diff --git a/include/linux/compat-2.6.36.h b/include/linux/compat-2.6.36.h
>>  index 7a82522..2d756d1 100644
>>  --- a/include/linux/compat-2.6.36.h
>>  +++ b/include/linux/compat-2.6.36.h
>>  @@ -123,6 +123,8 @@ static inline void tty_unlock(void) __releases(kernel_lock)
>>
>>   #define __rcu
>>
>>  +#define PCI_EEPROM_WIDTH_93C86	8
>>  +
>>   #endif /* (LINUX_VERSION_CODE<  KERNEL_VERSION(2,6,36)) */
>>
>>   #endif /* LINUX_26_36_COMPAT_H */
>
> NACK on this patch.
>
> PCI_EEPROM_WIDTH_93C86 is already defined in
> include/linux/eeprom_93cx6.h which is shipped with compat-wireless.
Oh, seems like I overlooked that while carrying along an old patch.
Thanks.

- Felix