2011-11-20 09:39:31

by Felix Fietkau

Subject: [PATCH] compat: fix misplaced #ifdef for the workqueue backport

Signed-off-by: Felix Fietkau <[email protected]>
---
compat/compat-2.6.36.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/compat/compat-2.6.36.c b/compat/compat-2.6.36.c
index fe24da8..dfab2ea 100644
--- a/compat/compat-2.6.36.c
+++ b/compat/compat-2.6.36.c
@@ -93,6 +93,8 @@ void compat_usb_scuttle_anchored_urbs(struct usb_anchor *anchor)
}
EXPORT_SYMBOL_GPL(compat_usb_scuttle_anchored_urbs);

+#endif /* CONFIG_COMPAT_USB_URB_THREAD_FIX */
+
struct workqueue_struct *system_nrt_wq __read_mostly;
EXPORT_SYMBOL_GPL(system_nrt_wq);

@@ -106,6 +108,3 @@ void compat_system_workqueue_destroy()
{
destroy_workqueue(system_nrt_wq);
}
-
-#endif /* CONFIG_COMPAT_USB_URB_THREAD_FIX */
-
--
1.7.3.2

2011-11-28 13:51:01

by Luis R. Rodriguez

Subject: Re: [PATCH] compat: fix misplaced #ifdef for the workqueue backport

On Sun, Nov 20, 2011 at 4:39 AM, Felix Fietkau <[email protected]> wrote:
> Signed-off-by: Felix Fietkau <[email protected]>

Thanks, applied and pushed! Also pushed onto the linux-3.2.y branch
and will make a new stable release with this based on 3.2.

Luis