2008-01-30 11:12:31

by Jonas Bonn

Subject: [PATCH] [SIS190] Constify data marked as __devinitdata

This fixes build error as gcc complains about a "section type conflict"
due to the const __devinitdata in sis190_get_mac_addr_from_apc().
---
drivers/net/sis190.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index b570402..e48e4ad 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -326,7 +326,7 @@ static const struct {
{ "SiS 191 PCI Gigabit Ethernet adapter" },
};

-static struct pci_device_id sis190_pci_tbl[] __devinitdata = {
+static const struct pci_device_id sis190_pci_tbl[] __devinitdata = {
{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 },
{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 },
{ 0, },
--
1.5.3.8

2008-01-30 11:23:37

by Jan Engelhardt

Subject: Re: [PATCH] [SIS190] Constify data marked as __devinitdata

On Jan 30 2008 11:53, Jonas Bonn wrote:
>
>This fixes build error as gcc complains about a "section type conflict"
>due to the const __devinitdata in sis190_get_mac_addr_from_apc().

>-static struct pci_device_id sis190_pci_tbl[] __devinitdata = {
>+static const struct pci_device_id sis190_pci_tbl[] __devinitdata = {
> { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 },
> { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 },
> { 0, },

Eh? Did you mean to

- static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
+ static u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };

instead? Because AFAIK, const *and* __sectionmarker does not mix.

2008-01-30 11:26:14

by Sam Ravnborg

Subject: Re: [PATCH] [SIS190] Constify data marked as __devinitdata

On Wed, Jan 30, 2008 at 12:23:23PM +0100, Jan Engelhardt wrote:
>
> On Jan 30 2008 11:53, Jonas Bonn wrote:
> >
> >This fixes build error as gcc complains about a "section type conflict"
> >due to the const __devinitdata in sis190_get_mac_addr_from_apc().
>
> >-static struct pci_device_id sis190_pci_tbl[] __devinitdata = {
> >+static const struct pci_device_id sis190_pci_tbl[] __devinitdata = {
> > { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 },
> > { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 },
> > { 0, },
>
> Eh? Did you mean to
>
> - static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
> + static u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
>
> instead? Because AFAIK, const *and* __sectionmarker does not mix.

We have just introduced __initconst, __cpuinitconst, __meminitconst
for const data.
So the patch is wrong.

Sam

2008-01-30 11:42:20

by Jonas Bonn

Subject: Re: [PATCH] [SIS190] Constify data marked as __devinitdata

>
> instead? Because AFAIK, const *and* __sectionmarker does not mix.
>

You're right... it's documented in linux/init.h that const and
__sectionmarker do not mix. The compile error is due to the use of
const and __section marker in the function sis190_get_mac_addr_from_apc().

2008-01-30 11:57:29

by Jonas Bonn

Subject: [PATCH] [SIS190] Use _devinitconst for const data

This fixes build error as gcc complains about a "section type conflict"
due to the mixing of const and non-const data in same section.
---
drivers/net/sis190.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index b570402..f84c02e 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -326,7 +326,7 @@ static const struct {
{ "SiS 191 PCI Gigabit Ethernet adapter" },
};

-static struct pci_device_id sis190_pci_tbl[] __devinitdata = {
+static struct pci_device_id sis190_pci_tbl[] __devinitconst = {
{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 },
{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 },
{ 0, },
@@ -1556,7 +1556,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
struct net_device *dev)
{
- static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
+ static u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
struct sis190_private *tp = netdev_priv(dev);
struct pci_dev *isa_bridge;
u8 reg, tmp8;
--
1.5.3.8

2008-01-30 12:22:15

by Sam Ravnborg

Subject: Re: [PATCH] [SIS190] Use _devinitconst for const data

On Wed, Jan 30, 2008 at 12:57:16PM +0100, Jonas Bonn wrote:
> This fixes build error as gcc complains about a "section type conflict"
> due to the mixing of const and non-const data in same section.
> ---
> drivers/net/sis190.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
> index b570402..f84c02e 100644
> --- a/drivers/net/sis190.c
> +++ b/drivers/net/sis190.c
> @@ -326,7 +326,7 @@ static const struct {
> { "SiS 191 PCI Gigabit Ethernet adapter" },
> };
>
> -static struct pci_device_id sis190_pci_tbl[] __devinitdata = {
> +static struct pci_device_id sis190_pci_tbl[] __devinitconst = {
> { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 },
> { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 },
> { 0, },
sis190_pci_tbl is not const...


> @@ -1556,7 +1556,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
> static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
> struct net_device *dev)
> {
> - static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
> + static u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
> struct sis190_private *tp = netdev_priv(dev);
> struct pci_dev *isa_bridge;
> u8 reg, tmp8;
> --
> 1.5.3.8
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

2008-01-30 13:31:20

by Jan Engelhardt

Subject: Re: [PATCH] [SIS190] Constify data marked as __devinitdata

On Jan 30 2008 12:25, Sam Ravnborg wrote:
>
>We have just introduced __initconst, __cpuinitconst, __meminitconst
>for const data.
>So the patch is wrong.

Oh joy, more tags. Is it actually possible to combine const
with __devinitconst now?

static const uint16_t foo[] __devinitconst = { ... };

2008-01-30 13:38:22

by Sam Ravnborg

Subject: Re: [PATCH] [SIS190] Constify data marked as __devinitdata

On Wed, Jan 30, 2008 at 02:31:05PM +0100, Jan Engelhardt wrote:
>
> On Jan 30 2008 12:25, Sam Ravnborg wrote:
> >
> >We have just introduced __initconst, __cpuinitconst, __meminitconst
> >for const data.
> >So the patch is wrong.
>
> Oh joy, more tags. Is it actually possible to combine const
> with __devinitconst now?
>
> static const uint16_t foo[] __devinitconst = { ... };

Yes, try it.

Sam

2008-01-30 13:41:34

by Jonas Bonn

Subject: [PATCH] [SIS190] Use __devinitconst for const devinit data

Mixing const and __section was previously not allowed. New __devinitconst tag
allows this.

This fixes a gcc "section type mismatch" build error.
---
drivers/net/sis190.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index b570402..d3126a9 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -326,7 +326,7 @@ static const struct {
{ "SiS 191 PCI Gigabit Ethernet adapter" },
};

-static struct pci_device_id sis190_pci_tbl[] __devinitdata = {
+static const struct pci_device_id sis190_pci_tbl[] __devinitconst = {
{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 },
{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 },
{ 0, },
@@ -1556,7 +1556,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
struct net_device *dev)
{
- static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
+ static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
struct sis190_private *tp = netdev_priv(dev);
struct pci_dev *isa_bridge;
u8 reg, tmp8;
--
1.5.3.8