* [PATCH] backports: rename some mem functions to not break custom kernels
@ 2013-08-07 8:52 Arik Nemtsov
2013-08-07 23:00 ` Hauke Mehrtens
0 siblings, 1 reply; 8+ messages in thread
From: Arik Nemtsov @ 2013-08-07 8:52 UTC (permalink / raw)
To: linux-wireless, mcgrof; +Cc: Arik Nemtsov
When custom patches are cherry-picked to a kernel, some symbols exported
by backports may clash with the built-in ones. Rename the backports
symbols using the standard backport_ prefix to prevent that. Backported
drivers will resolve to the correct function via a define.
The offending symbols were exported by the patch below:
commit 2ce5c22448bb45998318267c00b5d6ef9cff3170
Author: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu Jun 6 13:48:04 2013 +0200
backports: backport some memory functions
Signed-off-by: Arik Nemtsov <arik@wizery.com>
---
backport/backport-include/asm/mtrr.h | 7 +++++--
backport/backport-include/linux/io.h | 14 +++++++-------
backport/compat/backport-3.11.c | 16 ++++++++--------
3 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/backport/backport-include/asm/mtrr.h b/backport/backport-include/asm/mtrr.h
index cf0f6fd..c5760b4 100644
--- a/backport/backport-include/asm/mtrr.h
+++ b/backport/backport-include/asm/mtrr.h
@@ -7,14 +7,17 @@
* The following functions are for use by other drivers that cannot use
* arch_phys_wc_add and arch_phys_wc_del.
*/
+#ifndef phys_wc_to_mtrr_index
#ifdef CONFIG_MTRR
-extern int phys_wc_to_mtrr_index(int handle);
+extern int backport_phys_wc_to_mtrr_index(int handle);
#else
-static inline int phys_wc_to_mtrr_index(int handle)
+static inline int backport_phys_wc_to_mtrr_index(int handle)
{
return -1;
}
#endif /* CONFIG_MTRR */
+#define phys_wc_to_mtrr_index LINUX_BACKPORT(phys_wc_to_mtrr_index)
+#endif
#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)) */
#endif /* __BACKPORT_ASM_MTRR_H */
diff --git a/backport/backport-include/linux/io.h b/backport/backport-include/linux/io.h
index 9a5b308..5f62c62 100644
--- a/backport/backport-include/linux/io.h
+++ b/backport/backport-include/linux/io.h
@@ -15,22 +15,22 @@
*/
#ifndef arch_phys_wc_add
#ifdef CONFIG_MTRR
-extern int __must_check arch_phys_wc_add(unsigned long base,
- unsigned long size);
-extern void arch_phys_wc_del(int handle);
+extern int __must_check backport_arch_phys_wc_add(unsigned long base,
+ unsigned long size);
+extern void backport_arch_phys_wc_del(int handle);
#else
-static inline int __must_check arch_phys_wc_add(unsigned long base,
- unsigned long size)
+static inline int __must_check backport_arch_phys_wc_add(unsigned long base,
+ unsigned long size)
{
return 0; /* It worked (i.e. did nothing). */
}
-static inline void arch_phys_wc_del(int handle)
+static inline void backport_arch_phys_wc_del(int handle)
{
}
#endif /* CONFIG_MTRR */
-#define arch_phys_wc_add arch_phys_wc_add
+#define arch_phys_wc_add LINUX_BACKPORT(arch_phys_wc_add)
#endif
#endif /* __BACKPORT_LINUX_IO_H */
diff --git a/backport/compat/backport-3.11.c b/backport/compat/backport-3.11.c
index c6d5a02..5ff17d1 100644
--- a/backport/compat/backport-3.11.c
+++ b/backport/compat/backport-3.11.c
@@ -21,7 +21,7 @@
#define MTRR_TO_PHYS_WC_OFFSET 1000
/**
- * arch_phys_wc_add - add a WC MTRR and handle errors if PAT is unavailable
+ * backport_arch_phys_wc_add - add a WC MTRR and handle errors if PAT is unavailable
* @base: Physical base address
* @size: Size of region
*
@@ -32,7 +32,7 @@
* Drivers must store the return value to pass to mtrr_del_wc_if_needed,
* but drivers should not try to interpret that return value.
*/
-int arch_phys_wc_add(unsigned long base, unsigned long size)
+int backport_arch_phys_wc_add(unsigned long base, unsigned long size)
{
int ret;
@@ -49,7 +49,7 @@ int arch_phys_wc_add(unsigned long base, unsigned long size)
}
return ret + MTRR_TO_PHYS_WC_OFFSET;
}
-EXPORT_SYMBOL_GPL(arch_phys_wc_add);
+EXPORT_SYMBOL_GPL(backport_arch_phys_wc_add);
/*
* arch_phys_wc_del - undoes arch_phys_wc_add
@@ -60,17 +60,17 @@ EXPORT_SYMBOL_GPL(arch_phys_wc_add);
* The API guarantees that mtrr_del_wc_if_needed(error code) and
* mtrr_del_wc_if_needed(0) do nothing.
*/
-void arch_phys_wc_del(int handle)
+void backport_arch_phys_wc_del(int handle)
{
if (handle >= 1) {
WARN_ON(handle < MTRR_TO_PHYS_WC_OFFSET);
mtrr_del(handle - MTRR_TO_PHYS_WC_OFFSET, 0, 0);
}
}
-EXPORT_SYMBOL_GPL(arch_phys_wc_del);
+EXPORT_SYMBOL_GPL(backport_arch_phys_wc_del);
/*
- * phys_wc_to_mtrr_index - translates arch_phys_wc_add's return value
+ * backport_phys_wc_to_mtrr_index - translates arch_phys_wc_add's return value
* @handle: Return value from arch_phys_wc_add
*
* This will turn the return value from arch_phys_wc_add into an mtrr
@@ -80,13 +80,13 @@ EXPORT_SYMBOL_GPL(arch_phys_wc_del);
* in printk line. Alas there is an illegitimate use in some ancient
* drm ioctls.
*/
-int phys_wc_to_mtrr_index(int handle)
+int backport_phys_wc_to_mtrr_index(int handle)
{
if (handle < MTRR_TO_PHYS_WC_OFFSET)
return -1;
else
return handle - MTRR_TO_PHYS_WC_OFFSET;
}
-EXPORT_SYMBOL_GPL(phys_wc_to_mtrr_index);
+EXPORT_SYMBOL_GPL(backport_phys_wc_to_mtrr_index);
#endif /* CONFIG_MTRR */
--
1.8.1.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] backports: rename some mem functions to not break custom kernels
2013-08-07 8:52 [PATCH] backports: rename some mem functions to not break custom kernels Arik Nemtsov
@ 2013-08-07 23:00 ` Hauke Mehrtens
2013-08-08 6:45 ` Arik Nemtsov
0 siblings, 1 reply; 8+ messages in thread
From: Hauke Mehrtens @ 2013-08-07 23:00 UTC (permalink / raw)
To: Arik Nemtsov; +Cc: linux-wireless, mcgrof, backports@vger.kernel.org
Please add backports mailing list ( backports@vger.kernel.org ) next time.
On 08/07/2013 10:52 AM, Arik Nemtsov wrote:
> When custom patches are cherry-picked to a kernel, some symbols exported
> by backports may clash with the built-in ones. Rename the backports
> symbols using the standard backport_ prefix to prevent that. Backported
> drivers will resolve to the correct function via a define.
>
> The offending symbols were exported by the patch below:
>
> commit 2ce5c22448bb45998318267c00b5d6ef9cff3170
> Author: Hauke Mehrtens <hauke@hauke-m.de>
> Date: Thu Jun 6 13:48:04 2013 +0200
>
> backports: backport some memory functions
>
> Signed-off-by: Arik Nemtsov <arik@wizery.com>
> ---
> backport/backport-include/asm/mtrr.h | 7 +++++--
> backport/backport-include/linux/io.h | 14 +++++++-------
> backport/compat/backport-3.11.c | 16 ++++++++--------
> 3 files changed, 20 insertions(+), 17 deletions(-)
>
> diff --git a/backport/backport-include/asm/mtrr.h b/backport/backport-include/asm/mtrr.h
> index cf0f6fd..c5760b4 100644
> --- a/backport/backport-include/asm/mtrr.h
> +++ b/backport/backport-include/asm/mtrr.h
> @@ -7,14 +7,17 @@
> * The following functions are for use by other drivers that cannot use
> * arch_phys_wc_add and arch_phys_wc_del.
> */
> +#ifndef phys_wc_to_mtrr_index
> #ifdef CONFIG_MTRR
> -extern int phys_wc_to_mtrr_index(int handle);
> +extern int backport_phys_wc_to_mtrr_index(int handle);
> #else
> -static inline int phys_wc_to_mtrr_index(int handle)
> +static inline int backport_phys_wc_to_mtrr_index(int handle)
> {
> return -1;
> }
> #endif /* CONFIG_MTRR */
> +#define phys_wc_to_mtrr_index LINUX_BACKPORT(phys_wc_to_mtrr_index)
You should put this line before the #ifndef phy_.... and then you do not
have to use backport_phys_wc_to_mtrr_index with the prefix anywhere in
backports. This also applies for the other places where you manually add
backport_.
> +#endif
> #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)) */
>
> #endif /* __BACKPORT_ASM_MTRR_H */
> diff --git a/backport/backport-include/linux/io.h b/backport/backport-include/linux/io.h
> index 9a5b308..5f62c62 100644
> --- a/backport/backport-include/linux/io.h
> +++ b/backport/backport-include/linux/io.h
> @@ -15,22 +15,22 @@
> */
> #ifndef arch_phys_wc_add
> #ifdef CONFIG_MTRR
> -extern int __must_check arch_phys_wc_add(unsigned long base,
> - unsigned long size);
> -extern void arch_phys_wc_del(int handle);
> +extern int __must_check backport_arch_phys_wc_add(unsigned long base,
> + unsigned long size);
> +extern void backport_arch_phys_wc_del(int handle);
> #else
> -static inline int __must_check arch_phys_wc_add(unsigned long base,
> - unsigned long size)
> +static inline int __must_check backport_arch_phys_wc_add(unsigned long base,
> + unsigned long size)
> {
> return 0; /* It worked (i.e. did nothing). */
> }
>
> -static inline void arch_phys_wc_del(int handle)
> +static inline void backport_arch_phys_wc_del(int handle)
> {
> }
> #endif /* CONFIG_MTRR */
>
> -#define arch_phys_wc_add arch_phys_wc_add
> +#define arch_phys_wc_add LINUX_BACKPORT(arch_phys_wc_add)
> #endif
>
> #endif /* __BACKPORT_LINUX_IO_H */
> diff --git a/backport/compat/backport-3.11.c b/backport/compat/backport-3.11.c
> index c6d5a02..5ff17d1 100644
> --- a/backport/compat/backport-3.11.c
> +++ b/backport/compat/backport-3.11.c
> @@ -21,7 +21,7 @@
> #define MTRR_TO_PHYS_WC_OFFSET 1000
>
> /**
> - * arch_phys_wc_add - add a WC MTRR and handle errors if PAT is unavailable
> + * backport_arch_phys_wc_add - add a WC MTRR and handle errors if PAT is unavailable
> * @base: Physical base address
> * @size: Size of region
> *
> @@ -32,7 +32,7 @@
> * Drivers must store the return value to pass to mtrr_del_wc_if_needed,
> * but drivers should not try to interpret that return value.
> */
> -int arch_phys_wc_add(unsigned long base, unsigned long size)
> +int backport_arch_phys_wc_add(unsigned long base, unsigned long size)
> {
> int ret;
>
> @@ -49,7 +49,7 @@ int arch_phys_wc_add(unsigned long base, unsigned long size)
> }
> return ret + MTRR_TO_PHYS_WC_OFFSET;
> }
> -EXPORT_SYMBOL_GPL(arch_phys_wc_add);
> +EXPORT_SYMBOL_GPL(backport_arch_phys_wc_add);
>
> /*
> * arch_phys_wc_del - undoes arch_phys_wc_add
> @@ -60,17 +60,17 @@ EXPORT_SYMBOL_GPL(arch_phys_wc_add);
> * The API guarantees that mtrr_del_wc_if_needed(error code) and
> * mtrr_del_wc_if_needed(0) do nothing.
> */
> -void arch_phys_wc_del(int handle)
> +void backport_arch_phys_wc_del(int handle)
> {
> if (handle >= 1) {
> WARN_ON(handle < MTRR_TO_PHYS_WC_OFFSET);
> mtrr_del(handle - MTRR_TO_PHYS_WC_OFFSET, 0, 0);
> }
> }
> -EXPORT_SYMBOL_GPL(arch_phys_wc_del);
> +EXPORT_SYMBOL_GPL(backport_arch_phys_wc_del);
>
> /*
> - * phys_wc_to_mtrr_index - translates arch_phys_wc_add's return value
> + * backport_phys_wc_to_mtrr_index - translates arch_phys_wc_add's return value
> * @handle: Return value from arch_phys_wc_add
> *
> * This will turn the return value from arch_phys_wc_add into an mtrr
> @@ -80,13 +80,13 @@ EXPORT_SYMBOL_GPL(arch_phys_wc_del);
> * in printk line. Alas there is an illegitimate use in some ancient
> * drm ioctls.
> */
> -int phys_wc_to_mtrr_index(int handle)
> +int backport_phys_wc_to_mtrr_index(int handle)
> {
> if (handle < MTRR_TO_PHYS_WC_OFFSET)
> return -1;
> else
> return handle - MTRR_TO_PHYS_WC_OFFSET;
> }
> -EXPORT_SYMBOL_GPL(phys_wc_to_mtrr_index);
> +EXPORT_SYMBOL_GPL(backport_phys_wc_to_mtrr_index);
>
> #endif /* CONFIG_MTRR */
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] backports: rename some mem functions to not break custom kernels
2013-08-07 23:00 ` Hauke Mehrtens
@ 2013-08-08 6:45 ` Arik Nemtsov
2013-08-12 16:24 ` Hauke Mehrtens
0 siblings, 1 reply; 8+ messages in thread
From: Arik Nemtsov @ 2013-08-08 6:45 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: linux-wireless, mcgrof, backports@vger.kernel.org
On Thu, Aug 8, 2013 at 2:00 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> Please add backports mailing list ( backports@vger.kernel.org ) next time.
Ok. Thanks.
>> diff --git a/backport/backport-include/asm/mtrr.h b/backport/backport-include/asm/mtrr.h
>> index cf0f6fd..c5760b4 100644
>> --- a/backport/backport-include/asm/mtrr.h
>> +++ b/backport/backport-include/asm/mtrr.h
>> @@ -7,14 +7,17 @@
>> * The following functions are for use by other drivers that cannot use
>> * arch_phys_wc_add and arch_phys_wc_del.
>> */
>> +#ifndef phys_wc_to_mtrr_index
>> #ifdef CONFIG_MTRR
>> -extern int phys_wc_to_mtrr_index(int handle);
>> +extern int backport_phys_wc_to_mtrr_index(int handle);
>> #else
>> -static inline int phys_wc_to_mtrr_index(int handle)
>> +static inline int backport_phys_wc_to_mtrr_index(int handle)
>> {
>> return -1;
>> }
>> #endif /* CONFIG_MTRR */
>> +#define phys_wc_to_mtrr_index LINUX_BACKPORT(phys_wc_to_mtrr_index)
>
> You should put this line before the #ifndef phy_.... and then you do not
> have to use backport_phys_wc_to_mtrr_index with the prefix anywhere in
> backports. This also applies for the other places where you manually add
> backport_.
The case I'm trying to un-break here is one where the symbol is
defined by the kernel, even though it's not supposed to. This can
happen if someone cherry-picks patches containing this symbol into
their kernel.
The backported driver is better off using the kernel symbol in that
case I guess?
Arik
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] backports: rename some mem functions to not break custom kernels
2013-08-08 6:45 ` Arik Nemtsov
@ 2013-08-12 16:24 ` Hauke Mehrtens
2013-08-13 14:47 ` Arik Nemtsov
0 siblings, 1 reply; 8+ messages in thread
From: Hauke Mehrtens @ 2013-08-12 16:24 UTC (permalink / raw)
To: Arik Nemtsov; +Cc: linux-wireless, mcgrof, backports@vger.kernel.org
On 08/08/2013 08:45 AM, Arik Nemtsov wrote:
> On Thu, Aug 8, 2013 at 2:00 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
>> Please add backports mailing list ( backports@vger.kernel.org ) next time.
>
> Ok. Thanks.
>
>
>>> diff --git a/backport/backport-include/asm/mtrr.h b/backport/backport-include/asm/mtrr.h
>>> index cf0f6fd..c5760b4 100644
>>> --- a/backport/backport-include/asm/mtrr.h
>>> +++ b/backport/backport-include/asm/mtrr.h
>>> @@ -7,14 +7,17 @@
>>> * The following functions are for use by other drivers that cannot use
>>> * arch_phys_wc_add and arch_phys_wc_del.
>>> */
>>> +#ifndef phys_wc_to_mtrr_index
>>> #ifdef CONFIG_MTRR
>>> -extern int phys_wc_to_mtrr_index(int handle);
>>> +extern int backport_phys_wc_to_mtrr_index(int handle);
>>> #else
>>> -static inline int phys_wc_to_mtrr_index(int handle)
>>> +static inline int backport_phys_wc_to_mtrr_index(int handle)
>>> {
>>> return -1;
>>> }
>>> #endif /* CONFIG_MTRR */
>>> +#define phys_wc_to_mtrr_index LINUX_BACKPORT(phys_wc_to_mtrr_index)
>>
>> You should put this line before the #ifndef phy_.... and then you do not
>> have to use backport_phys_wc_to_mtrr_index with the prefix anywhere in
>> backports. This also applies for the other places where you manually add
>> backport_.
>
> The case I'm trying to un-break here is one where the symbol is
> defined by the kernel, even though it's not supposed to. This can
> happen if someone cherry-picks patches containing this symbol into
> their kernel.
> The backported driver is better off using the kernel symbol in that
> case I guess?
>
> Arik
Hi Arik,
adding the LINUX_BACKPORT() line should be enough to rename it
everywhere in backprots, so you do not have to modify
backport/compat/backport-3.11.c or manually add the prefix anywhere else.
Could you try if this fixes your problems with phys_wc_to_mtrr_index:
...
+#define phys_wc_to_mtrr_index LINUX_BACKPORT(phys_wc_to_mtrr_index)
#ifdef CONFIG_MTRR
extern int phys_wc_to_mtrr_index(int handle);
#else
static inline int phys_wc_to_mtrr_index(int handle)
{
return -1;
}
#endif /* CONFIG_MTRR */
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] backports: rename some mem functions to not break custom kernels
2013-08-12 16:24 ` Hauke Mehrtens
@ 2013-08-13 14:47 ` Arik Nemtsov
2013-08-13 21:11 ` Luis R. Rodriguez
0 siblings, 1 reply; 8+ messages in thread
From: Arik Nemtsov @ 2013-08-13 14:47 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: linux-wireless, mcgrof, backports@vger.kernel.org
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
On Mon, Aug 12, 2013 at 7:24 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> adding the LINUX_BACKPORT() line should be enough to rename it
> everywhere in backprots, so you do not have to modify
> backport/compat/backport-3.11.c or manually add the prefix anywhere else.
>
> Could you try if this fixes your problems with phys_wc_to_mtrr_index:
>
> ...
> +#define phys_wc_to_mtrr_index LINUX_BACKPORT(phys_wc_to_mtrr_index)
> #ifdef CONFIG_MTRR
> extern int phys_wc_to_mtrr_index(int handle);
> #else
> static inline int phys_wc_to_mtrr_index(int handle)
> {
> return -1;
> }
> #endif /* CONFIG_MTRR */
>
Thanks. It seems to do the trick. The attached patch solves the issue.
Luis - any comments on this one?
Regards,
Arik
[-- Attachment #2: 0001-backports-rename-some-mem-functions-to-not-break-cus.patch --]
[-- Type: application/octet-stream, Size: 1891 bytes --]
From ffcb716aaf2a3fe61af29e74fe23c4688f39a53d Mon Sep 17 00:00:00 2001
From: Arik Nemtsov <arik@wizery.com>
Date: Tue, 6 Aug 2013 18:28:56 +0300
Subject: [PATCH] backports: rename some mem functions to not break custom
kernels
When custom patches are cherry-picked to a kernel, some symbols exported
by backports may clash with the built-in ones. Rename the backports
symbols using the standard backport_ prefix to prevent that.
The offending symbols were exported by the patch below:
commit 2ce5c22448bb45998318267c00b5d6ef9cff3170
Author: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu Jun 6 13:48:04 2013 +0200
backports: backport some memory functions
Signed-off-by: Arik Nemtsov <arik@wizery.com>
---
backport/backport-include/asm/mtrr.h | 1 +
backport/backport-include/linux/io.h | 3 +++
2 files changed, 4 insertions(+)
diff --git a/backport/backport-include/asm/mtrr.h b/backport/backport-include/asm/mtrr.h
index cf0f6fd..861438a 100644
--- a/backport/backport-include/asm/mtrr.h
+++ b/backport/backport-include/asm/mtrr.h
@@ -7,6 +7,7 @@
* The following functions are for use by other drivers that cannot use
* arch_phys_wc_add and arch_phys_wc_del.
*/
+#define phys_wc_to_mtrr_index LINUX_BACKPORT(phys_wc_to_mtrr_index)
#ifdef CONFIG_MTRR
extern int phys_wc_to_mtrr_index(int handle);
#else
diff --git a/backport/backport-include/linux/io.h b/backport/backport-include/linux/io.h
index 9a5b308..5447df8 100644
--- a/backport/backport-include/linux/io.h
+++ b/backport/backport-include/linux/io.h
@@ -13,6 +13,9 @@
* arch_phys_del_wc(0) or arch_phys_del_wc(any error code) is guaranteed
* to have no effect.
*/
+#define arch_phys_wc_add LINUX_BACKPORT(arch_phys_wc_add)
+#define arch_phys_wc_del LINUX_BACKPORT(arch_phys_wc_del)
+
#ifndef arch_phys_wc_add
#ifdef CONFIG_MTRR
extern int __must_check arch_phys_wc_add(unsigned long base,
--
1.8.1.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] backports: rename some mem functions to not break custom kernels
2013-08-13 14:47 ` Arik Nemtsov
@ 2013-08-13 21:11 ` Luis R. Rodriguez
0 siblings, 0 replies; 8+ messages in thread
From: Luis R. Rodriguez @ 2013-08-13 21:11 UTC (permalink / raw)
To: Arik Nemtsov
Cc: Hauke Mehrtens, linux-wireless, mcgrof, backports@vger.kernel.org
On Tue, Aug 13, 2013 at 05:47:53PM +0300, Arik Nemtsov wrote:
> On Mon, Aug 12, 2013 at 7:24 PM, Hauke Mehrtens <hauke@hauke-m.de> wrote:
> > adding the LINUX_BACKPORT() line should be enough to rename it
> > everywhere in backprots, so you do not have to modify
> > backport/compat/backport-3.11.c or manually add the prefix anywhere else.
> >
> > Could you try if this fixes your problems with phys_wc_to_mtrr_index:
> >
> > ...
> > +#define phys_wc_to_mtrr_index LINUX_BACKPORT(phys_wc_to_mtrr_index)
> > #ifdef CONFIG_MTRR
> > extern int phys_wc_to_mtrr_index(int handle);
> > #else
> > static inline int phys_wc_to_mtrr_index(int handle)
> > {
> > return -1;
> > }
> > #endif /* CONFIG_MTRR */
> >
>
> Thanks. It seems to do the trick. The attached patch solves the issue.
> Luis - any comments on this one?
I welcome a new patch in proper form with a Signed-off-by by the author.
Luis
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] backports: rename some mem functions to not break custom kernels
@ 2013-08-14 7:48 Arik Nemtsov
2013-08-16 3:14 ` Luis R. Rodriguez
0 siblings, 1 reply; 8+ messages in thread
From: Arik Nemtsov @ 2013-08-14 7:48 UTC (permalink / raw)
To: linux-wireless, mcgrof; +Cc: Arik Nemtsov
When custom patches are cherry-picked to a kernel, some symbols exported
by backports may clash with the built-in ones. Rename the backports
symbols using the standard backport_ prefix to prevent that.
The offending symbols were exported by the patch below:
commit 2ce5c22448bb45998318267c00b5d6ef9cff3170
Author: Hauke Mehrtens <hauke@hauke-m.de>
Date: Thu Jun 6 13:48:04 2013 +0200
backports: backport some memory functions
Signed-off-by: Arik Nemtsov <arik@wizery.com>
---
backport/backport-include/asm/mtrr.h | 1 +
backport/backport-include/linux/io.h | 3 +++
2 files changed, 4 insertions(+)
diff --git a/backport/backport-include/asm/mtrr.h b/backport/backport-include/asm/mtrr.h
index cf0f6fd..861438a 100644
--- a/backport/backport-include/asm/mtrr.h
+++ b/backport/backport-include/asm/mtrr.h
@@ -7,6 +7,7 @@
* The following functions are for use by other drivers that cannot use
* arch_phys_wc_add and arch_phys_wc_del.
*/
+#define phys_wc_to_mtrr_index LINUX_BACKPORT(phys_wc_to_mtrr_index)
#ifdef CONFIG_MTRR
extern int phys_wc_to_mtrr_index(int handle);
#else
diff --git a/backport/backport-include/linux/io.h b/backport/backport-include/linux/io.h
index 9a5b308..5447df8 100644
--- a/backport/backport-include/linux/io.h
+++ b/backport/backport-include/linux/io.h
@@ -13,6 +13,9 @@
* arch_phys_del_wc(0) or arch_phys_del_wc(any error code) is guaranteed
* to have no effect.
*/
+#define arch_phys_wc_add LINUX_BACKPORT(arch_phys_wc_add)
+#define arch_phys_wc_del LINUX_BACKPORT(arch_phys_wc_del)
+
#ifndef arch_phys_wc_add
#ifdef CONFIG_MTRR
extern int __must_check arch_phys_wc_add(unsigned long base,
--
1.8.1.2
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] backports: rename some mem functions to not break custom kernels
2013-08-14 7:48 Arik Nemtsov
@ 2013-08-16 3:14 ` Luis R. Rodriguez
0 siblings, 0 replies; 8+ messages in thread
From: Luis R. Rodriguez @ 2013-08-16 3:14 UTC (permalink / raw)
To: Arik Nemtsov, backports; +Cc: linux-wireless, mcgrof
On Wed, Aug 14, 2013 at 10:48:05AM +0300, Arik Nemtsov wrote:
> When custom patches are cherry-picked to a kernel, some symbols exported
> by backports may clash with the built-in ones. Rename the backports
> symbols using the standard backport_ prefix to prevent that.
>
> The offending symbols were exported by the patch below:
>
> commit 2ce5c22448bb45998318267c00b5d6ef9cff3170
> Author: Hauke Mehrtens <hauke@hauke-m.de>
> Date: Thu Jun 6 13:48:04 2013 +0200
>
> backports: backport some memory functions
>
> Signed-off-by: Arik Nemtsov <arik@wizery.com>
Thanks, applied and pushed. Next time please add
the backports@vger.kernel.org list.
Luis
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-08-16 3:05 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-07 8:52 [PATCH] backports: rename some mem functions to not break custom kernels Arik Nemtsov
2013-08-07 23:00 ` Hauke Mehrtens
2013-08-08 6:45 ` Arik Nemtsov
2013-08-12 16:24 ` Hauke Mehrtens
2013-08-13 14:47 ` Arik Nemtsov
2013-08-13 21:11 ` Luis R. Rodriguez
-- strict thread matches above, loose matches on Subject: below --
2013-08-14 7:48 Arik Nemtsov
2013-08-16 3:14 ` Luis R. Rodriguez
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox