Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1340720 > unrolled thread
| Started by | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| First post | 2016-02-23 15:50 +0100 |
| Last post | 2016-03-02 17:40 +0100 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] ARM: at91: avoid defining CONFIG_* symbols in source code Arnd Bergmann <arnd@arndb.de> - 2016-02-23 15:50 +0100
Re: [PATCH] ARM: at91: avoid defining CONFIG_* symbols in source code Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2016-03-01 10:00 +0100
Re: [PATCH] ARM: at91: avoid defining CONFIG_* symbols in source code Nicolas Ferre <nicolas.ferre@atmel.com> - 2016-03-02 16:50 +0100
Re: [PATCH] ARM: at91: avoid defining CONFIG_* symbols in source code Arnd Bergmann <arnd@arndb.de> - 2016-03-02 17:40 +0100
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2016-02-23 15:50 +0100 |
| Subject | [PATCH] ARM: at91: avoid defining CONFIG_* symbols in source code |
| Message-ID | <r5mrM-6NG-15@gated-at.bofh.it> |
In an invalid randconfig build (fixed by another patch), I ran across this warning: arch/arm/include/debug/at91.S:18:0: error: "CONFIG_DEBUG_UART_VIRT" redefined [-Werror] #define CONFIG_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS) As Russell pointed out, we should never #define a macro starting with CONFIG_ in a source file, as that is rather confusing. This renames the macro to avoid the symbol clash. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Suggested-by: Russell King <linux@arm.linux.org.uk> --- arch/arm/include/debug/at91.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/debug/at91.S b/arch/arm/include/debug/at91.S index 43243be94cfc..d4ae3b8e2426 100644 --- a/arch/arm/include/debug/at91.S +++ b/arch/arm/include/debug/at91.S @@ -15,7 +15,7 @@ #define AT91_IO_P2V(x) (x) #endif -#define CONFIG_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS) +#define AT91_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS) #define AT91_DBGU_SR (0x14) /* Status Register */ #define AT91_DBGU_THR (0x1c) /* Transmitter Holding Register */ @@ -24,7 +24,7 @@ .macro addruart, rp, rv, tmp ldr \rp, =CONFIG_DEBUG_UART_PHYS @ System peripherals (phys address) - ldr \rv, =CONFIG_DEBUG_UART_VIRT @ System peripherals (virt address) + ldr \rv, =AT91_DEBUG_UART_VIRT @ System peripherals (virt address) .endm .macro senduart,rd,rx -- 2.7.0
[toc] | [next] | [standalone]
| From | Alexandre Belloni <alexandre.belloni@free-electrons.com> |
|---|---|
| Date | 2016-03-01 10:00 +0100 |
| Message-ID | <r7OjU-6MP-5@gated-at.bofh.it> |
| In reply to | #1340720 |
On 23/02/2016 at 15:39:38 +0100, Arnd Bergmann wrote : > In an invalid randconfig build (fixed by another patch), > I ran across this warning: > > arch/arm/include/debug/at91.S:18:0: error: "CONFIG_DEBUG_UART_VIRT" redefined [-Werror] > #define CONFIG_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS) > > As Russell pointed out, we should never #define a macro starting > with CONFIG_ in a source file, as that is rather confusing. > > This renames the macro to avoid the symbol clash. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Suggested-by: Russell King <linux@arm.linux.org.uk> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > --- > arch/arm/include/debug/at91.S | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/include/debug/at91.S b/arch/arm/include/debug/at91.S > index 43243be94cfc..d4ae3b8e2426 100644 > --- a/arch/arm/include/debug/at91.S > +++ b/arch/arm/include/debug/at91.S > @@ -15,7 +15,7 @@ > #define AT91_IO_P2V(x) (x) > #endif > > -#define CONFIG_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS) > +#define AT91_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS) > > #define AT91_DBGU_SR (0x14) /* Status Register */ > #define AT91_DBGU_THR (0x1c) /* Transmitter Holding Register */ > @@ -24,7 +24,7 @@ > > .macro addruart, rp, rv, tmp > ldr \rp, =CONFIG_DEBUG_UART_PHYS @ System peripherals (phys address) > - ldr \rv, =CONFIG_DEBUG_UART_VIRT @ System peripherals (virt address) > + ldr \rv, =AT91_DEBUG_UART_VIRT @ System peripherals (virt address) > .endm > > .macro senduart,rd,rx > -- > 2.7.0 > -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
[toc] | [prev] | [next] | [standalone]
| From | Nicolas Ferre <nicolas.ferre@atmel.com> |
|---|---|
| Date | 2016-03-02 16:50 +0100 |
| Message-ID | <r8hcg-1c4-61@gated-at.bofh.it> |
| In reply to | #1340720 |
Le 23/02/2016 15:39, Arnd Bergmann a écrit : > In an invalid randconfig build (fixed by another patch), > I ran across this warning: > > arch/arm/include/debug/at91.S:18:0: error: "CONFIG_DEBUG_UART_VIRT" redefined [-Werror] > #define CONFIG_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS) > > As Russell pointed out, we should never #define a macro starting > with CONFIG_ in a source file, as that is rather confusing. > > This renames the macro to avoid the symbol clash. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Suggested-by: Russell King <linux@arm.linux.org.uk> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Arnd, Can you please add this patch on top of the arm-soc branches "soc" or "cleanup" for 4.6. I don't think that we will have more material for these branches to send to you before the opening of the merge window. Thanks for your patch, bye. > --- > arch/arm/include/debug/at91.S | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/include/debug/at91.S b/arch/arm/include/debug/at91.S > index 43243be94cfc..d4ae3b8e2426 100644 > --- a/arch/arm/include/debug/at91.S > +++ b/arch/arm/include/debug/at91.S > @@ -15,7 +15,7 @@ > #define AT91_IO_P2V(x) (x) > #endif > > -#define CONFIG_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS) > +#define AT91_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS) > > #define AT91_DBGU_SR (0x14) /* Status Register */ > #define AT91_DBGU_THR (0x1c) /* Transmitter Holding Register */ > @@ -24,7 +24,7 @@ > > .macro addruart, rp, rv, tmp > ldr \rp, =CONFIG_DEBUG_UART_PHYS @ System peripherals (phys address) > - ldr \rv, =CONFIG_DEBUG_UART_VIRT @ System peripherals (virt address) > + ldr \rv, =AT91_DEBUG_UART_VIRT @ System peripherals (virt address) > .endm > > .macro senduart,rd,rx > -- Nicolas Ferre
[toc] | [prev] | [next] | [standalone]
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2016-03-02 17:40 +0100 |
| Message-ID | <r8hYB-1Lj-13@gated-at.bofh.it> |
| In reply to | #1348207 |
On Wednesday 02 March 2016 16:46:35 Nicolas Ferre wrote: > Le 23/02/2016 15:39, Arnd Bergmann a écrit : > > In an invalid randconfig build (fixed by another patch), > > I ran across this warning: > > > > arch/arm/include/debug/at91.S:18:0: error: "CONFIG_DEBUG_UART_VIRT" redefined [-Werror] > > #define CONFIG_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS) > > > > As Russell pointed out, we should never #define a macro starting > > with CONFIG_ in a source file, as that is rather confusing. > > > > This renames the macro to avoid the symbol clash. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Suggested-by: Russell King <linux@arm.linux.org.uk> > > Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > > Arnd, > > Can you please add this patch on top of the arm-soc branches "soc" or > "cleanup" for 4.6. > I don't think that we will have more material for these branches to send > to you before the opening of the merge window. > > Thanks for your patch, bye. Applied to next/soc, thanks! Arnd
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web