Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Constify function pointer tables.
[SPARC64]: Fix section error in sparcspkr
[SPARC64]: Fix of section mismatch warnings.
+30
-27
+1
-1
arch/sparc/kernel/setup.c
+1
-1
arch/sparc/kernel/setup.c
+4
-4
arch/sparc64/kernel/pci_fire.c
+4
-4
arch/sparc64/kernel/pci_fire.c
···
30
30
"i" (ASI_PHYS_BYPASS_EC_E) \
31
31
: "memory")
32
32
33
-
static void pci_fire_scan_bus(struct pci_pbm_info *pbm)
33
+
static void __init pci_fire_scan_bus(struct pci_pbm_info *pbm)
34
34
{
35
35
pbm->pci_bus = pci_scan_one_pbm(pbm);
36
36
···
434
434
fire_write(pbm->pbm_regs + FIRE_PEC_IENAB, ~(u64)0);
435
435
}
436
436
437
-
static int pci_fire_pbm_init(struct pci_controller_info *p,
438
-
struct device_node *dp, u32 portid)
437
+
static int __init pci_fire_pbm_init(struct pci_controller_info *p,
438
+
struct device_node *dp, u32 portid)
439
439
{
440
440
const struct linux_prom64_registers *regs;
441
441
struct pci_pbm_info *pbm;
···
488
488
return 0;
489
489
}
490
490
491
-
void fire_pci_init(struct device_node *dp, const char *model_name)
491
+
void __init fire_pci_init(struct device_node *dp, const char *model_name)
492
492
{
493
493
struct pci_controller_info *p;
494
494
u32 portid = of_getintprop_default(dp, "portid", 0xff);
+3
-3
arch/sparc64/kernel/pci_psycho.c
+3
-3
arch/sparc64/kernel/pci_psycho.c
···
801
801
pci_config_write8(addr, 64);
802
802
}
803
803
804
-
static void psycho_scan_bus(struct pci_pbm_info *pbm)
804
+
static void __init psycho_scan_bus(struct pci_pbm_info *pbm)
805
805
{
806
806
pbm_config_busmastering(pbm);
807
807
pbm->is_66mhz_capable = 0;
···
965
965
#define PSYCHO_MEMSPACE_B 0x180000000UL
966
966
#define PSYCHO_MEMSPACE_SIZE 0x07fffffffUL
967
967
968
-
static void psycho_pbm_init(struct pci_controller_info *p,
968
+
static void __init psycho_pbm_init(struct pci_controller_info *p,
969
969
struct device_node *dp, int is_pbm_a)
970
970
{
971
971
struct property *prop;
···
1012
1012
1013
1013
#define PSYCHO_CONFIGSPACE 0x001000000UL
1014
1014
1015
-
void psycho_init(struct device_node *dp, char *model_name)
1015
+
void __init psycho_init(struct device_node *dp, char *model_name)
1016
1016
{
1017
1017
struct linux_prom64_registers *pr_regs;
1018
1018
struct pci_controller_info *p;
+4
-3
arch/sparc64/kernel/pci_sabre.c
+4
-3
arch/sparc64/kernel/pci_sabre.c
···
633
633
}
634
634
}
635
635
636
-
static void sabre_scan_bus(struct pci_pbm_info *pbm)
636
+
static void __init sabre_scan_bus(struct pci_pbm_info *pbm)
637
637
{
638
638
static int once;
639
639
···
731
731
return 0;
732
732
}
733
733
734
-
static void sabre_pbm_init(struct pci_controller_info *p, struct pci_pbm_info *pbm, struct device_node *dp)
734
+
static void __init sabre_pbm_init(struct pci_controller_info *p,
735
+
struct pci_pbm_info *pbm, struct device_node *dp)
735
736
{
736
737
pbm->name = dp->full_name;
737
738
printk("%s: SABRE PCI Bus Module\n", pbm->name);
···
751
750
pci_determine_mem_io_space(pbm);
752
751
}
753
752
754
-
void sabre_init(struct device_node *dp, char *model_name)
753
+
void __init sabre_init(struct device_node *dp, char *model_name)
755
754
{
756
755
const struct linux_prom64_registers *pr_regs;
757
756
struct pci_controller_info *p;
+9
-8
arch/sparc64/kernel/pci_schizo.c
+9
-8
arch/sparc64/kernel/pci_schizo.c
···
1084
1084
pci_config_write8(addr, 64);
1085
1085
}
1086
1086
1087
-
static void schizo_scan_bus(struct pci_pbm_info *pbm)
1087
+
static void __init schizo_scan_bus(struct pci_pbm_info *pbm)
1088
1088
{
1089
1089
pbm_config_busmastering(pbm);
1090
1090
pbm->is_66mhz_capable =
···
1333
1333
}
1334
1334
}
1335
1335
1336
-
static int schizo_pbm_init(struct pci_controller_info *p,
1337
-
struct device_node *dp, u32 portid,
1338
-
int chip_type)
1336
+
static int __init schizo_pbm_init(struct pci_controller_info *p,
1337
+
struct device_node *dp, u32 portid,
1338
+
int chip_type)
1339
1339
{
1340
1340
const struct linux_prom64_registers *regs;
1341
1341
struct pci_pbm_info *pbm;
···
1430
1430
return (x == y);
1431
1431
}
1432
1432
1433
-
static void __schizo_init(struct device_node *dp, char *model_name, int chip_type)
1433
+
static void __init __schizo_init(struct device_node *dp, char *model_name,
1434
+
int chip_type)
1434
1435
{
1435
1436
struct pci_controller_info *p;
1436
1437
struct pci_pbm_info *pbm;
···
1475
1474
prom_halt();
1476
1475
}
1477
1476
1478
-
void schizo_init(struct device_node *dp, char *model_name)
1477
+
void __init schizo_init(struct device_node *dp, char *model_name)
1479
1478
{
1480
1479
__schizo_init(dp, model_name, PBM_CHIP_TYPE_SCHIZO);
1481
1480
}
1482
1481
1483
-
void schizo_plus_init(struct device_node *dp, char *model_name)
1482
+
void __init schizo_plus_init(struct device_node *dp, char *model_name)
1484
1483
{
1485
1484
__schizo_init(dp, model_name, PBM_CHIP_TYPE_SCHIZO_PLUS);
1486
1485
}
1487
1486
1488
-
void tomatillo_init(struct device_node *dp, char *model_name)
1487
+
void __init tomatillo_init(struct device_node *dp, char *model_name)
1489
1488
{
1490
1489
__schizo_init(dp, model_name, PBM_CHIP_TYPE_TOMATILLO);
1491
1490
}
+3
-2
arch/sparc64/kernel/pci_sun4v.c
+3
-2
arch/sparc64/kernel/pci_sun4v.c
···
612
612
.sync_sg_for_cpu = dma_4v_sync_sg_for_cpu,
613
613
};
614
614
615
-
static void pci_sun4v_scan_bus(struct pci_pbm_info *pbm)
615
+
static void __init pci_sun4v_scan_bus(struct pci_pbm_info *pbm)
616
616
{
617
617
struct property *prop;
618
618
struct device_node *dp;
···
960
960
}
961
961
#endif /* !(CONFIG_PCI_MSI) */
962
962
963
-
static void __init pci_sun4v_pbm_init(struct pci_controller_info *p, struct device_node *dp, u32 devhandle)
963
+
static void __init pci_sun4v_pbm_init(struct pci_controller_info *p,
964
+
struct device_node *dp, u32 devhandle)
964
965
{
965
966
struct pci_pbm_info *pbm;
966
967
+1
-1
arch/sparc64/kernel/setup.c
+1
-1
arch/sparc64/kernel/setup.c
+1
-1
arch/sparc64/kernel/vio.c
+1
-1
arch/sparc64/kernel/vio.c
+1
-1
arch/sparc64/solaris/socksys.c
+1
-1
arch/sparc64/solaris/socksys.c
+2
-2
drivers/input/misc/sparcspkr.c
+2
-2
drivers/input/misc/sparcspkr.c
···
195
195
.name = "beep",
196
196
.match_table = ebus_beep_match,
197
197
.probe = ebus_beep_probe,
198
-
.remove = sparcspkr_remove,
198
+
.remove = __devexit_p(sparcspkr_remove),
199
199
.shutdown = sparcspkr_shutdown,
200
200
};
201
201
···
236
236
.name = "beep",
237
237
.match_table = isa_beep_match,
238
238
.probe = isa_beep_probe,
239
-
.remove = sparcspkr_remove,
239
+
.remove = __devexit_p(sparcspkr_remove),
240
240
.shutdown = sparcspkr_shutdown,
241
241
};
242
242