sparc64: Fix section mis-match errors.

Fix all of the problems spotted by CONFIG_DEBUG_SECTION_MISMATCH under
arch/sparc during a 64-bit defconfig build.

They fall into two categorites:

1) of_device_id is marked as __initdata, and we can never do this
   since these objects sit in the device core data structures way
   past boot.  So even if a driver will never be reloaded, we have
   to keep the device ID table around.

   Mark such cases const instead.

2) The bootmem alloc/free handling code in mdesc.c was not fully
   marked __init as it should be, thus generating a reference
   to free_bootmem_late() (which is __init) from non-__init code.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2011-03-30 17:37:56 -07:00
parent c897dcf631
commit 3628aa0657
11 changed files with 14 additions and 14 deletions

View File

@ -93,7 +93,7 @@ void auxio_set_lte(int on)
}
EXPORT_SYMBOL(auxio_set_lte);
static struct of_device_id __initdata auxio_match[] = {
static const struct of_device_id auxio_match[] = {
{
.name = "auxio",
},

View File

@ -140,7 +140,7 @@ out_free:
goto out;
}
static struct of_device_id __initdata clock_board_match[] = {
static const struct of_device_id clock_board_match[] = {
{
.name = "clock-board",
},
@ -245,7 +245,7 @@ out_free:
goto out;
}
static struct of_device_id __initdata fhc_match[] = {
static const struct of_device_id fhc_match[] = {
{
.name = "fhc",
},

View File

@ -1218,7 +1218,7 @@ static int ds_remove(struct vio_dev *vdev)
return 0;
}
static struct vio_device_id __initdata ds_match[] = {
static const struct vio_device_id ds_match[] = {
{
.type = "domain-services-port",
},

View File

@ -107,7 +107,7 @@ static struct mdesc_handle * __init mdesc_memblock_alloc(unsigned int mdesc_size
return hp;
}
static void mdesc_memblock_free(struct mdesc_handle *hp)
static void __init mdesc_memblock_free(struct mdesc_handle *hp)
{
unsigned int alloc_size;
unsigned long start;

View File

@ -496,7 +496,7 @@ out_err:
return err;
}
static struct of_device_id __initdata fire_match[] = {
static const struct of_device_id fire_match[] = {
{
.name = "pci",
.compatible = "pciex108e,80f0",

View File

@ -592,7 +592,7 @@ out_err:
return err;
}
static struct of_device_id __initdata psycho_match[] = {
static const struct of_device_id psycho_match[] = {
{
.name = "pci",
.compatible = "pci108e,8000",

View File

@ -581,7 +581,7 @@ out_err:
return err;
}
static struct of_device_id __initdata sabre_match[] = {
static const struct of_device_id sabre_match[] = {
{
.name = "pci",
.compatible = "pci108e,a001",

View File

@ -1470,7 +1470,7 @@ static int __devinit schizo_probe(struct platform_device *op)
* and pci108e,8001. So list the chips in reverse chronological
* order.
*/
static struct of_device_id __initdata schizo_match[] = {
static const struct of_device_id schizo_match[] = {
{
.name = "pci",
.compatible = "pci108e,a801",

View File

@ -998,7 +998,7 @@ out_err:
return err;
}
static struct of_device_id __initdata pci_sun4v_match[] = {
static const struct of_device_id pci_sun4v_match[] = {
{
.name = "pci",
.compatible = "SUNW,sun4v-pci",

View File

@ -52,7 +52,7 @@ static int __devinit power_probe(struct platform_device *op)
return 0;
}
static struct of_device_id __initdata power_match[] = {
static const struct of_device_id power_match[] = {
{
.name = "power",
},

View File

@ -442,7 +442,7 @@ static int __devinit rtc_probe(struct platform_device *op)
return platform_device_register(&rtc_cmos_device);
}
static struct of_device_id __initdata rtc_match[] = {
static const struct of_device_id rtc_match[] = {
{
.name = "rtc",
.compatible = "m5819",
@ -487,7 +487,7 @@ static int __devinit bq4802_probe(struct platform_device *op)
return platform_device_register(&rtc_bq4802_device);
}
static struct of_device_id __initdata bq4802_match[] = {
static const struct of_device_id bq4802_match[] = {
{
.name = "rtc",
.compatible = "bq4802",
@ -552,7 +552,7 @@ static int __devinit mostek_probe(struct platform_device *op)
return platform_device_register(&m48t59_rtc);
}
static struct of_device_id __initdata mostek_match[] = {
static const struct of_device_id mostek_match[] = {
{
.name = "eeprom",
},