From 64035b94c95ae8190a2ec7216f3bd08c1bc5d667 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 2 Apr 2013 10:45:54 +0200 Subject: [PATCH] fix COMPAT_USB_URB_THREAD_FIX option Signed-off-by: Johannes Berg --- compat/compat/Kconfig | 4 ++++ compat/compat/compat-2.6.36.c | 4 ++-- compat/include/linux/compat-2.6.36.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/compat/compat/Kconfig b/compat/compat/Kconfig index 958d8ac2f666..ab0ffcef2d0f 100644 --- a/compat/compat/Kconfig +++ b/compat/compat/Kconfig @@ -87,3 +87,7 @@ config BACKPORT_BUILD_AVERAGE config BACKPORT_AVERAGE bool + +config BACKPORT_OPTION_USB_URB_THREAD_FIX + bool + default y if BACKPORT_KERNEL_2_6_36 diff --git a/compat/compat/compat-2.6.36.c b/compat/compat/compat-2.6.36.c index 9295895b9379..92ef827a0e7c 100644 --- a/compat/compat/compat-2.6.36.c +++ b/compat/compat/compat-2.6.36.c @@ -11,7 +11,7 @@ #include #include -#ifdef CONFIG_COMPAT_USB_URB_THREAD_FIX +#ifdef CPTCFG_BACKPORT_OPTION_USB_URB_THREAD_FIX /* Callers must hold anchor->lock */ static void __usb_unanchor_urb(struct urb *urb, struct usb_anchor *anchor) { @@ -93,7 +93,7 @@ void usb_scuttle_anchored_urbs(struct usb_anchor *anchor) } EXPORT_SYMBOL_GPL(usb_scuttle_anchored_urbs); -#endif /* CONFIG_COMPAT_USB_URB_THREAD_FIX */ +#endif /* CPTCFG_BACKPORT_OPTION_USB_URB_THREAD_FIX */ struct workqueue_struct *system_wq __read_mostly; struct workqueue_struct *system_long_wq __read_mostly; diff --git a/compat/include/linux/compat-2.6.36.h b/compat/include/linux/compat-2.6.36.h index d90b84f674c4..6afd66174a3f 100644 --- a/compat/include/linux/compat-2.6.36.h +++ b/compat/include/linux/compat-2.6.36.h @@ -24,7 +24,7 @@ struct va_format { #define device_rename(dev, new_name) device_rename(dev, (char *)new_name) -#ifdef CONFIG_COMPAT_USB_URB_THREAD_FIX +#ifdef CPTCFG_BACKPORT_OPTION_USB_URB_THREAD_FIX #define usb_scuttle_anchored_urbs LINUX_BACKPORT(usb_scuttle_anchored_urbs) #define usb_get_from_anchor LINUX_BACKPORT(usb_get_from_anchor) #define usb_unlink_anchored_urbs LINUX_BACKPORT(usb_unlink_anchored_urbs) -- 2.30.2