Re: [PATCH 03/31] sections: Fix section conflicts in arch/frv

2012-10-15 Thread David Howells 
Andi Kleen  wrote:

> Does this fix it? -Andi

Works for me.  I've added it to my FRV fixup patches.

David
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 03/31] sections: Fix section conflicts in arch/frv

2012-10-15 Thread David Howells 
Andi Kleen a...@firstfloor.org wrote:

 Does this fix it? -Andi

Works for me.  I've added it to my FRV fixup patches.

David
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 03/31] sections: Fix section conflicts in arch/frv

2012-10-11 Thread Andi Kleen 
> Unfortunately __pminitconst isn't defined at this point:
> arch/frv/kernel/setup.c:187:47: error: expected '=', ',', ';', 'asm'
> or '__attribute__' before '*' token
> arch/frv/kernel/setup.c:386:2: error: 'clock_cmodes' undeclared (first
> use in this function)
> arch/frv/kernel/setup.c:571:6: error: 'clock_cmodes' undeclared (first
> use in this function)
> make[2]: *** [arch/frv/kernel/setup.o] Error 1
> 
> http://kisskb.ellerman.id.au/kisskb/buildresult/7344691/
> 
> It seems the __pminit* variants are frv-specific, and don't cover all possible
> combinations?

Thanks for reporting.

Does this fix it? -Andi

---

frv: Fix const sections changhe

Add __pminitconst to fix the build again.

Reported by: Geert Uytterhoeven
Signed-off-by: Andi Kleen 

diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index 1f1e5ef..b8993c8 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -112,9 +112,11 @@ char __initdata redboot_command_line[COMMAND_LINE_SIZE];
 #ifdef CONFIG_PM
 #define __pminit
 #define __pminitdata
+#define __pminitconst
 #else
 #define __pminit __init
 #define __pminitdata __initdata
+#define __pminitconst __initconst
 #endif
 
 struct clock_cmode {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 03/31] sections: Fix section conflicts in arch/frv

2012-10-11 Thread Geert Uytterhoeven 
On Sat, Aug 18, 2012 at 7:29 PM, Andi Kleen  wrote:
> From: Andi Kleen 
>
> Signed-off-by: Andi Kleen 
> ---
>  arch/frv/kernel/setup.c |2 +-
>  arch/frv/mb93090-mb00/pci-irq.c |2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
> index 75cf7f4..1f1e5ef 100644
> --- a/arch/frv/kernel/setup.c
> +++ b/arch/frv/kernel/setup.c
> @@ -184,7 +184,7 @@ static struct clock_cmode __pminitdata 
> clock_cmodes_fr555[16] = {
> [6] = { _x1,_x1_5,  _x1_5,  _x4_5,  _x0_375 },
>  };
>
> -static const struct clock_cmode __pminitdata *clock_cmodes;
> +static const struct clock_cmode __pminitconst *clock_cmodes;

Unfortunately __pminitconst isn't defined at this point:
arch/frv/kernel/setup.c:187:47: error: expected '=', ',', ';', 'asm'
or '__attribute__' before '*' token
arch/frv/kernel/setup.c:386:2: error: 'clock_cmodes' undeclared (first
use in this function)
arch/frv/kernel/setup.c:571:6: error: 'clock_cmodes' undeclared (first
use in this function)
make[2]: *** [arch/frv/kernel/setup.o] Error 1

http://kisskb.ellerman.id.au/kisskb/buildresult/7344691/

It seems the __pminit* variants are frv-specific, and don't cover all possible
combinations?

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 03/31] sections: Fix section conflicts in arch/frv

2012-10-11 Thread Geert Uytterhoeven 
On Sat, Aug 18, 2012 at 7:29 PM, Andi Kleen a...@firstfloor.org wrote:
 From: Andi Kleen a...@linux.intel.com

 Signed-off-by: Andi Kleen a...@linux.intel.com
 ---
  arch/frv/kernel/setup.c |2 +-
  arch/frv/mb93090-mb00/pci-irq.c |2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

 diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
 index 75cf7f4..1f1e5ef 100644
 --- a/arch/frv/kernel/setup.c
 +++ b/arch/frv/kernel/setup.c
 @@ -184,7 +184,7 @@ static struct clock_cmode __pminitdata 
 clock_cmodes_fr555[16] = {
 [6] = { _x1,_x1_5,  _x1_5,  _x4_5,  _x0_375 },
  };

 -static const struct clock_cmode __pminitdata *clock_cmodes;
 +static const struct clock_cmode __pminitconst *clock_cmodes;

Unfortunately __pminitconst isn't defined at this point:
arch/frv/kernel/setup.c:187:47: error: expected '=', ',', ';', 'asm'
or '__attribute__' before '*' token
arch/frv/kernel/setup.c:386:2: error: 'clock_cmodes' undeclared (first
use in this function)
arch/frv/kernel/setup.c:571:6: error: 'clock_cmodes' undeclared (first
use in this function)
make[2]: *** [arch/frv/kernel/setup.o] Error 1

http://kisskb.ellerman.id.au/kisskb/buildresult/7344691/

It seems the __pminit* variants are frv-specific, and don't cover all possible
combinations?

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say programmer or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 03/31] sections: Fix section conflicts in arch/frv

2012-10-11 Thread Andi Kleen 
 Unfortunately __pminitconst isn't defined at this point:
 arch/frv/kernel/setup.c:187:47: error: expected '=', ',', ';', 'asm'
 or '__attribute__' before '*' token
 arch/frv/kernel/setup.c:386:2: error: 'clock_cmodes' undeclared (first
 use in this function)
 arch/frv/kernel/setup.c:571:6: error: 'clock_cmodes' undeclared (first
 use in this function)
 make[2]: *** [arch/frv/kernel/setup.o] Error 1
 
 http://kisskb.ellerman.id.au/kisskb/buildresult/7344691/
 
 It seems the __pminit* variants are frv-specific, and don't cover all possible
 combinations?

Thanks for reporting.

Does this fix it? -Andi

---

frv: Fix const sections changhe

Add __pminitconst to fix the build again.

Reported by: Geert Uytterhoeven
Signed-off-by: Andi Kleen a...@linux.intel.com

diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index 1f1e5ef..b8993c8 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -112,9 +112,11 @@ char __initdata redboot_command_line[COMMAND_LINE_SIZE];
 #ifdef CONFIG_PM
 #define __pminit
 #define __pminitdata
+#define __pminitconst
 #else
 #define __pminit __init
 #define __pminitdata __initdata
+#define __pminitconst __initconst
 #endif
 
 struct clock_cmode {
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 03/31] sections: Fix section conflicts in arch/frv

2012-08-18 Thread Andi Kleen 
From: Andi Kleen 

Signed-off-by: Andi Kleen 
---
 arch/frv/kernel/setup.c |2 +-
 arch/frv/mb93090-mb00/pci-irq.c |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index 75cf7f4..1f1e5ef 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -184,7 +184,7 @@ static struct clock_cmode __pminitdata 
clock_cmodes_fr555[16] = {
[6] = { _x1,_x1_5,  _x1_5,  _x4_5,  _x0_375 },
 };
 
-static const struct clock_cmode __pminitdata *clock_cmodes;
+static const struct clock_cmode __pminitconst *clock_cmodes;
 static int __pminitdata clock_doubled;
 
 static struct uart_port __pminitdata __frv_uart0 = {
diff --git a/arch/frv/mb93090-mb00/pci-irq.c b/arch/frv/mb93090-mb00/pci-irq.c
index 20f6497..c677b9d 100644
--- a/arch/frv/mb93090-mb00/pci-irq.c
+++ b/arch/frv/mb93090-mb00/pci-irq.c
@@ -28,7 +28,7 @@
  *
  */
 
-static const uint8_t __initdata pci_bus0_irq_routing[32][4] = {
+static const uint8_t __initconst pci_bus0_irq_routing[32][4] = {
[0 ] = { IRQ_FPGA_MB86943_PCI_INTA },
[16] = { IRQ_FPGA_RTL8029_INTA },
[17] = { IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA, 
IRQ_FPGA_PCI_INTB },
-- 
1.7.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 03/31] sections: Fix section conflicts in arch/frv

2012-08-18 Thread Andi Kleen 
From: Andi Kleen a...@linux.intel.com

Signed-off-by: Andi Kleen a...@linux.intel.com
---
 arch/frv/kernel/setup.c |2 +-
 arch/frv/mb93090-mb00/pci-irq.c |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index 75cf7f4..1f1e5ef 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -184,7 +184,7 @@ static struct clock_cmode __pminitdata 
clock_cmodes_fr555[16] = {
[6] = { _x1,_x1_5,  _x1_5,  _x4_5,  _x0_375 },
 };
 
-static const struct clock_cmode __pminitdata *clock_cmodes;
+static const struct clock_cmode __pminitconst *clock_cmodes;
 static int __pminitdata clock_doubled;
 
 static struct uart_port __pminitdata __frv_uart0 = {
diff --git a/arch/frv/mb93090-mb00/pci-irq.c b/arch/frv/mb93090-mb00/pci-irq.c
index 20f6497..c677b9d 100644
--- a/arch/frv/mb93090-mb00/pci-irq.c
+++ b/arch/frv/mb93090-mb00/pci-irq.c
@@ -28,7 +28,7 @@
  *
  */
 
-static const uint8_t __initdata pci_bus0_irq_routing[32][4] = {
+static const uint8_t __initconst pci_bus0_irq_routing[32][4] = {
[0 ] = { IRQ_FPGA_MB86943_PCI_INTA },
[16] = { IRQ_FPGA_RTL8029_INTA },
[17] = { IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA, 
IRQ_FPGA_PCI_INTB },
-- 
1.7.7.6

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/