* [PATCH 1/2] compat: avoid warning in compat_system_workqueue_create
@ 2011-11-17 0:39 John W. Linville
2011-11-17 0:39 ` [PATCH 2/2] compat: implement dummy security_sk_clone John W. Linville
2011-11-18 19:24 ` [PATCH 1/2] compat: avoid warning in compat_system_workqueue_create Hauke Mehrtens
0 siblings, 2 replies; 6+ messages in thread
From: John W. Linville @ 2011-11-17 0:39 UTC (permalink / raw)
To: linux-wireless; +Cc: Hauke Mehrtens, Luis R. Rodriguez, John W. Linville
The check in the WARN_ON is inverted.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
compat/compat-2.6.36.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/compat/compat-2.6.36.c b/compat/compat-2.6.36.c
index aab25df..fe24da8 100644
--- a/compat/compat-2.6.36.c
+++ b/compat/compat-2.6.36.c
@@ -99,7 +99,7 @@ EXPORT_SYMBOL_GPL(system_nrt_wq);
void compat_system_workqueue_create()
{
system_nrt_wq = create_singlethread_workqueue("events_nrt");
- WARN_ON(system_nrt_wq);
+ WARN_ON(!system_nrt_wq);
}
void compat_system_workqueue_destroy()
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] compat: implement dummy security_sk_clone
2011-11-17 0:39 [PATCH 1/2] compat: avoid warning in compat_system_workqueue_create John W. Linville
@ 2011-11-17 0:39 ` John W. Linville
2011-11-18 19:37 ` Hauke Mehrtens
2011-11-18 19:24 ` [PATCH 1/2] compat: avoid warning in compat_system_workqueue_create Hauke Mehrtens
1 sibling, 1 reply; 6+ messages in thread
From: John W. Linville @ 2011-11-17 0:39 UTC (permalink / raw)
To: linux-wireless; +Cc: Hauke Mehrtens, Luis R. Rodriguez, John W. Linville
This has been defined in include/linux/security.h for some time, but was
only given an EXPORT_SYMBOL for 3.2. Add a compat_* definition to avoid
breaking the module load with an undefined symbol.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
include/linux/compat-3.2.h | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/include/linux/compat-3.2.h b/include/linux/compat-3.2.h
index ceaaecc..08f102f 100644
--- a/include/linux/compat-3.2.h
+++ b/include/linux/compat-3.2.h
@@ -72,6 +72,17 @@ static inline char *hex_byte_pack(char *buf, u8 byte)
return buf;
}
+/*
+ * This has been defined in include/linux/security.h for some time, but was
+ * only given an EXPORT_SYMBOL for 3.2. Add a compat_* definition to avoid
+ * breaking the compile.
+ */
+#define security_sk_clone(a, b) compat_security_sk_clone(a, b)
+
+static inline void security_sk_clone(const struct sock *sk, struct sock *newsk)
+{
+}
+
#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)) */
#endif /* LINUX_3_2_COMPAT_H */
--
1.7.4.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] compat: implement dummy security_sk_clone
2011-11-17 0:39 ` [PATCH 2/2] compat: implement dummy security_sk_clone John W. Linville
@ 2011-11-18 19:37 ` Hauke Mehrtens
2011-11-18 20:53 ` John W. Linville
0 siblings, 1 reply; 6+ messages in thread
From: Hauke Mehrtens @ 2011-11-18 19:37 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, Luis R. Rodriguez
On 11/17/2011 01:39 AM, John W. Linville wrote:
> This has been defined in include/linux/security.h for some time, but was
> only given an EXPORT_SYMBOL for 3.2. Add a compat_* definition to avoid
> breaking the module load with an undefined symbol.
>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> ---
> include/linux/compat-3.2.h | 11 +++++++++++
> 1 files changed, 11 insertions(+), 0 deletions(-)
>
> diff --git a/include/linux/compat-3.2.h b/include/linux/compat-3.2.h
> index ceaaecc..08f102f 100644
> --- a/include/linux/compat-3.2.h
> +++ b/include/linux/compat-3.2.h
> @@ -72,6 +72,17 @@ static inline char *hex_byte_pack(char *buf, u8 byte)
> return buf;
> }
>
> +/*
> + * This has been defined in include/linux/security.h for some time, but was
> + * only given an EXPORT_SYMBOL for 3.2. Add a compat_* definition to avoid
> + * breaking the compile.
> + */
> +#define security_sk_clone(a, b) compat_security_sk_clone(a, b)
> +
> +static inline void security_sk_clone(const struct sock *sk, struct sock *newsk)
> +{
> +}
> +
> #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)) */
>
> #endif /* LINUX_3_2_COMPAT_H */
Hi,
security_sk_clone gets also exported in Linux-3.1 so this should move to
include/linux/compat-3.1.h. 3.1-rcX did not contain this fix, but I hope
nobody is using this any more.
Hauke
$ git tag --contains 6230c9b4f8957c8938ee4cf2d03166d3c2dc89de
v3.1
v3.1.1
v3.2-rc1
v3.2-rc2
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] compat: implement dummy security_sk_clone
2011-11-18 19:37 ` Hauke Mehrtens
@ 2011-11-18 20:53 ` John W. Linville
0 siblings, 0 replies; 6+ messages in thread
From: John W. Linville @ 2011-11-18 20:53 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: linux-wireless, Luis R. Rodriguez
On Fri, Nov 18, 2011 at 08:37:30PM +0100, Hauke Mehrtens wrote:
> On 11/17/2011 01:39 AM, John W. Linville wrote:
> > This has been defined in include/linux/security.h for some time, but was
> > only given an EXPORT_SYMBOL for 3.2. Add a compat_* definition to avoid
> > breaking the module load with an undefined symbol.
> >
> > Signed-off-by: John W. Linville <linville@tuxdriver.com>
<snip>
> Hi,
>
> security_sk_clone gets also exported in Linux-3.1 so this should move to
> include/linux/compat-3.1.h. 3.1-rcX did not contain this fix, but I hope
> nobody is using this any more.
>
> Hauke
>
> $ git tag --contains 6230c9b4f8957c8938ee4cf2d03166d3c2dc89de
> v3.1
> v3.1.1
> v3.2-rc1
> v3.2-rc2
My bad -- must have misread it! Sending a new one now...
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] compat: avoid warning in compat_system_workqueue_create
2011-11-17 0:39 [PATCH 1/2] compat: avoid warning in compat_system_workqueue_create John W. Linville
2011-11-17 0:39 ` [PATCH 2/2] compat: implement dummy security_sk_clone John W. Linville
@ 2011-11-18 19:24 ` Hauke Mehrtens
2011-11-18 19:32 ` Luis R. Rodriguez
1 sibling, 1 reply; 6+ messages in thread
From: Hauke Mehrtens @ 2011-11-18 19:24 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, Luis R. Rodriguez
On 11/17/2011 01:39 AM, John W. Linville wrote:
> The check in the WARN_ON is inverted.
>
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> ---
> compat/compat-2.6.36.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/compat/compat-2.6.36.c b/compat/compat-2.6.36.c
> index aab25df..fe24da8 100644
> --- a/compat/compat-2.6.36.c
> +++ b/compat/compat-2.6.36.c
> @@ -99,7 +99,7 @@ EXPORT_SYMBOL_GPL(system_nrt_wq);
> void compat_system_workqueue_create()
> {
> system_nrt_wq = create_singlethread_workqueue("events_nrt");
> - WARN_ON(system_nrt_wq);
> + WARN_ON(!system_nrt_wq);
> }
>
> void compat_system_workqueue_destroy()
That was my fault, please apply this patch.
Hauke
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] compat: avoid warning in compat_system_workqueue_create
2011-11-18 19:24 ` [PATCH 1/2] compat: avoid warning in compat_system_workqueue_create Hauke Mehrtens
@ 2011-11-18 19:32 ` Luis R. Rodriguez
0 siblings, 0 replies; 6+ messages in thread
From: Luis R. Rodriguez @ 2011-11-18 19:32 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: John W. Linville, linux-wireless
On Fri, Nov 18, 2011 at 11:24 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> On 11/17/2011 01:39 AM, John W. Linville wrote:
>> The check in the WARN_ON is inverted.
>>
> Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
>> Signed-off-by: John W. Linville <linville@tuxdriver.com>
>> ---
>> compat/compat-2.6.36.c | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/compat/compat-2.6.36.c b/compat/compat-2.6.36.c
>> index aab25df..fe24da8 100644
>> --- a/compat/compat-2.6.36.c
>> +++ b/compat/compat-2.6.36.c
>> @@ -99,7 +99,7 @@ EXPORT_SYMBOL_GPL(system_nrt_wq);
>> void compat_system_workqueue_create()
>> {
>> system_nrt_wq = create_singlethread_workqueue("events_nrt");
>> - WARN_ON(system_nrt_wq);
>> + WARN_ON(!system_nrt_wq);
>> }
>>
>> void compat_system_workqueue_destroy()
>
> That was my fault, please apply this patch.
Odd, I thought I had applied this already, sorry for the delay,
applied and pushed, I also applied this patch on the linux-3.2.y
branch, I'll make another stable release based on 3.2 for this as
otherwise people will get these warnings for their backports.
Luis
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-11-18 20:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-17 0:39 [PATCH 1/2] compat: avoid warning in compat_system_workqueue_create John W. Linville
2011-11-17 0:39 ` [PATCH 2/2] compat: implement dummy security_sk_clone John W. Linville
2011-11-18 19:37 ` Hauke Mehrtens
2011-11-18 20:53 ` John W. Linville
2011-11-18 19:24 ` [PATCH 1/2] compat: avoid warning in compat_system_workqueue_create Hauke Mehrtens
2011-11-18 19:32 ` Luis R. Rodriguez
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.